From 740dfed1a8443cf5bd48b9558351d30883aafaaf Mon Sep 17 00:00:00 2001
From: Philipp <mail@pl-coding.com>
Date: Mon, 20 Sep 2021 22:02:57 +0200
Subject: [PATCH 01/14] Finished app

---
 .idea/deploymentTargetDropDown.xml            |  17 ++
 .idea/gradle.xml                              |   1 +
 .idea/inspectionProfiles/Project_Default.xml  |  20 +++
 .../49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d  |   2 +
 .../5dd0036e6eaabc1cbb2545b80a0bfffc2708a45b  |   0
 .../9ea6805d7eed655f05d5c8957775a6e66211bf8e  |   0
 .../f07866736216be0ee2aba49e392191aeae700a35  |   0
 .../f4a01d6a4fcb971362ec00a83903fd3902f52164  |   0
 .idea/sonarlint/issuestore/index.pb           |  11 ++
 .idea/vcs.xml                                 |   6 +
 app/src/main/AndroidManifest.xml              |   3 +-
 .../cleanarchitecturenoteapp/MainActivity.kt  |  22 ---
 .../cleanarchitecturenoteapp/NoteApp.kt       |   7 +
 .../cleanarchitecturenoteapp/di/AppModule.kt  |  45 ++++++
 .../feature_note/data/data_source/NoteDao.kt  |  21 +++
 .../data/data_source/NoteDatabase.kt          |  18 +++
 .../data/repository/NoteRepositoryImpl.kt     |  27 ++++
 .../feature_note/domain/model/Note.kt         |  20 +++
 .../domain/repository/NoteRepository.kt       |  15 ++
 .../feature_note/domain/use_case/AddNote.kt   |  21 +++
 .../domain/use_case/DeleteNote.kt             |  13 ++
 .../feature_note/domain/use_case/GetNote.kt   |  13 ++
 .../feature_note/domain/use_case/GetNotes.kt  |  36 +++++
 .../domain/use_case/NoteUseCases.kt           |   8 +
 .../feature_note/domain/util/NoteOrder.kt     |  15 ++
 .../feature_note/domain/util/OrderType.kt     |   6 +
 .../feature_note/presentation/MainActivity.kt |  70 +++++++++
 .../add_edit_note/AddEditNoteEvent.kt         |  13 ++
 .../add_edit_note/AddEditNoteScreen.kt        | 147 ++++++++++++++++++
 .../add_edit_note/AddEditNoteViewModel.kt     | 119 ++++++++++++++
 .../add_edit_note/NoteTextFieldState.kt       |   7 +
 .../components/TransparentHintTextField.kt    |  43 +++++
 .../presentation/notes/NotesEvent.kt          |  11 ++
 .../presentation/notes/NotesScreen.kt         | 118 ++++++++++++++
 .../presentation/notes/NotesState.kt          |  11 ++
 .../presentation/notes/NotesViewModel.kt      |  75 +++++++++
 .../notes/components/DefaultRadioButton.kt    |  37 +++++
 .../presentation/notes/components/NoteItem.kt |  95 +++++++++++
 .../notes/components/OrderSection.kt          |  61 ++++++++
 .../feature_note/presentation/util/Screen.kt  |   6 +
 40 files changed, 1137 insertions(+), 23 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/sonarlint/issuestore/4/9/49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d
 create mode 100644 .idea/sonarlint/issuestore/5/d/5dd0036e6eaabc1cbb2545b80a0bfffc2708a45b
 create mode 100644 .idea/sonarlint/issuestore/9/e/9ea6805d7eed655f05d5c8957775a6e66211bf8e
 create mode 100644 .idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35
 create mode 100644 .idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
 create mode 100644 .idea/vcs.xml
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..165d9c32
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\phili\.android\avd\Pixel_4_API_29_1.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-09-20T13:54:08.797688700Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4e3844e8..526b4c25 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..28422375
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,20 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/4/9/49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d b/.idea/sonarlint/issuestore/4/9/49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d
new file mode 100644
index 00000000..6f1e916c
--- /dev/null
+++ b/.idea/sonarlint/issuestore/4/9/49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d
@@ -0,0 +1,2 @@
+
+Okotlin:S1172"2Remove this unused function parameter "darkTheme".(áèžìûÿÿÿÿ

\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/5/d/5dd0036e6eaabc1cbb2545b80a0bfffc2708a45b b/.idea/sonarlint/issuestore/5/d/5dd0036e6eaabc1cbb2545b80a0bfffc2708a45b
new file mode 100644
index 00000000..e69de29b
diff --git a/.idea/sonarlint/issuestore/9/e/9ea6805d7eed655f05d5c8957775a6e66211bf8e b/.idea/sonarlint/issuestore/9/e/9ea6805d7eed655f05d5c8957775a6e66211bf8e
new file mode 100644
index 00000000..e69de29b
diff --git a/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 b/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35
new file mode 100644
index 00000000..e69de29b
diff --git a/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
new file mode 100644
index 00000000..e69de29b
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
index e69de29b..003d1499 100644
--- a/.idea/sonarlint/issuestore/index.pb
+++ b/.idea/sonarlint/issuestore/index.pb
@@ -0,0 +1,11 @@
+
+y
+Iapp/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt,9\e\9ea6805d7eed655f05d5c8957775a6e66211bf8e
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+y
+Iapp/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt,4\9\49714c180cf12e6bb0fb0f86b8a2e6b52e75ed1d
+y
+Iapp/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt,5\d\5dd0036e6eaabc1cbb2545b80a0bfffc2708a45b
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 052e8301..88340904 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.plcoding.cleanarchitecturenoteapp">
 
     <application
+        android:name=".NoteApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -10,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.CleanArchitectureNoteApp">
         <activity
-            android:name=".MainActivity"
+            android:name=".feature_note.presentation.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.CleanArchitectureNoteApp">
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
deleted file mode 100644
index 8282fe24..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
-import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            CleanArchitectureNoteAppTheme {
-                
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt
new file mode 100644
index 00000000..ec915d87
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt
@@ -0,0 +1,7 @@
+package com.plcoding.cleanarchitecturenoteapp
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class NoteApp : Application()
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
new file mode 100644
index 00000000..92660b5f
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
@@ -0,0 +1,45 @@
+package com.plcoding.cleanarchitecturenoteapp.di
+
+import android.app.Application
+import androidx.room.Room
+import com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source.NoteDatabase
+import com.plcoding.cleanarchitecturenoteapp.feature_note.data.repository.NoteRepositoryImpl
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.*
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppModule {
+
+    @Provides
+    @Singleton
+    fun provideNoteDatabase(app: Application): NoteDatabase {
+        return Room.databaseBuilder(
+            app,
+            NoteDatabase::class.java,
+            NoteDatabase.DATABASE_NAME
+        ).build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideNoteRepository(db: NoteDatabase): NoteRepository {
+        return NoteRepositoryImpl(db.noteDao)
+    }
+
+    @Provides
+    @Singleton
+    fun provideNoteUseCases(repository: NoteRepository): NoteUseCases {
+        return NoteUseCases(
+            getNotes = GetNotes(repository),
+            deleteNote = DeleteNote(repository),
+            addNote = AddNote(repository),
+            getNote = GetNote(repository)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
new file mode 100644
index 00000000..fdcb3405
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
@@ -0,0 +1,21 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source
+
+import androidx.room.*
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface NoteDao {
+
+    @Query("SELECT * FROM note")
+    fun getNotes(): Flow<List<Note>>
+
+    @Query("SELECT * FROM note WHERE id = :id")
+    suspend fun getNoteById(id: Int): Note?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertNote(note: Note)
+
+    @Delete
+    suspend fun deleteNote(note: Note)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt
new file mode 100644
index 00000000..4dd871af
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt
@@ -0,0 +1,18 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+
+@Database(
+    entities = [Note::class],
+    version = 1
+)
+abstract class NoteDatabase: RoomDatabase() {
+
+    abstract val noteDao: NoteDao
+
+    companion object {
+        const val DATABASE_NAME = "notes_db"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
new file mode 100644
index 00000000..39d93125
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
@@ -0,0 +1,27 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.data.repository
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source.NoteDao
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+import kotlinx.coroutines.flow.Flow
+
+class NoteRepositoryImpl(
+    private val dao: NoteDao
+) : NoteRepository {
+
+    override fun getNotes(): Flow<List<Note>> {
+        return dao.getNotes()
+    }
+
+    override suspend fun getNoteById(id: Int): Note? {
+        return dao.getNoteById(id)
+    }
+
+    override suspend fun insertNote(note: Note) {
+        dao.insertNote(note)
+    }
+
+    override suspend fun deleteNote(note: Note) {
+        dao.deleteNote(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
new file mode 100644
index 00000000..68214ccd
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
@@ -0,0 +1,20 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.plcoding.cleanarchitecturenoteapp.ui.theme.*
+
+@Entity
+data class Note(
+    val title: String,
+    val content: String,
+    val timestamp: Long,
+    val color: Int,
+    @PrimaryKey val id: Int? = null
+) {
+    companion object {
+        val noteColors = listOf(RedOrange, LightGreen, Violet, BabyBlue, RedPink)
+    }
+}
+
+class InvalidNoteException(message: String): Exception(message)
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
new file mode 100644
index 00000000..471b748a
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
@@ -0,0 +1,15 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import kotlinx.coroutines.flow.Flow
+
+interface NoteRepository {
+
+    fun getNotes(): Flow<List<Note>>
+
+    suspend fun getNoteById(id: Int): Note?
+
+    suspend fun insertNote(note: Note)
+
+    suspend fun deleteNote(note: Note)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt
new file mode 100644
index 00000000..5e243dff
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt
@@ -0,0 +1,21 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.InvalidNoteException
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+
+class AddNote(
+    private val repository: NoteRepository
+) {
+
+    @Throws(InvalidNoteException::class)
+    suspend operator fun invoke(note: Note) {
+        if(note.title.isBlank()) {
+            throw InvalidNoteException("The title of the note can't be empty.")
+        }
+        if(note.content.isBlank()) {
+            throw InvalidNoteException("The content of the note can't be empty.")
+        }
+        repository.insertNote(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
new file mode 100644
index 00000000..e57acdfe
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
@@ -0,0 +1,13 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+
+class DeleteNote(
+    private val repository: NoteRepository
+) {
+
+    suspend operator fun invoke(note: Note) {
+        repository.deleteNote(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
new file mode 100644
index 00000000..84e8978c
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
@@ -0,0 +1,13 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+
+class GetNote(
+    private val repository: NoteRepository
+) {
+
+    suspend operator fun invoke(id: Int): Note? {
+        return repository.getNoteById(id)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt
new file mode 100644
index 00000000..ac94e18f
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt
@@ -0,0 +1,36 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class GetNotes(
+    private val repository: NoteRepository
+) {
+
+    operator fun invoke(
+        noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending)
+    ): Flow<List<Note>> {
+        return repository.getNotes().map { notes ->
+            when(noteOrder.orderType) {
+                is OrderType.Ascending -> {
+                    when(noteOrder) {
+                        is NoteOrder.Title -> notes.sortedBy { it.title.lowercase() }
+                        is NoteOrder.Date -> notes.sortedBy { it.timestamp }
+                        is NoteOrder.Color -> notes.sortedBy { it.color }
+                    }
+                }
+                is OrderType.Descending -> {
+                    when(noteOrder) {
+                        is NoteOrder.Title -> notes.sortedByDescending { it.title.lowercase() }
+                        is NoteOrder.Date -> notes.sortedByDescending { it.timestamp }
+                        is NoteOrder.Color -> notes.sortedByDescending { it.color }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt
new file mode 100644
index 00000000..a89b00c1
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt
@@ -0,0 +1,8 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+
+data class NoteUseCases(
+    val getNotes: GetNotes,
+    val deleteNote: DeleteNote,
+    val addNote: AddNote,
+    val getNote: GetNote
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt
new file mode 100644
index 00000000..eb7fa913
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt
@@ -0,0 +1,15 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util
+
+sealed class NoteOrder(val orderType: OrderType) {
+    class Title(orderType: OrderType): NoteOrder(orderType)
+    class Date(orderType: OrderType): NoteOrder(orderType)
+    class Color(orderType: OrderType): NoteOrder(orderType)
+
+    fun copy(orderType: OrderType): NoteOrder {
+        return when(this) {
+            is Title -> Title(orderType)
+            is Date -> Date(orderType)
+            is Color -> Color(orderType)
+        }
+    }
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
new file mode 100644
index 00000000..de897a19
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
@@ -0,0 +1,6 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util
+
+sealed class OrderType {
+    object Ascending: OrderType()
+    object Descending: OrderType()
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
new file mode 100644
index 00000000..850240ae
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
@@ -0,0 +1,70 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.AddEditNoteScreen
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.NotesScreen
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util.Screen
+import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    @ExperimentalAnimationApi
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CleanArchitectureNoteAppTheme {
+                Surface(
+                    color = MaterialTheme.colors.background
+                ) {
+                    val navController = rememberNavController()
+                    NavHost(
+                        navController = navController,
+                        startDestination = Screen.NotesScreen.route
+                    ) {
+                        composable(route = Screen.NotesScreen.route) {
+                            NotesScreen(navController = navController)
+                        }
+                        composable(
+                            route = Screen.AddEditNoteScreen.route +
+                                    "?noteId={noteId}&noteColor={noteColor}",
+                            arguments = listOf(
+                                navArgument(
+                                    name = "noteId"
+                                ) {
+                                    type = NavType.IntType
+                                    defaultValue = -1
+                                },
+                                navArgument(
+                                    name = "noteColor"
+                                ) {
+                                    type = NavType.IntType
+                                    defaultValue = -1
+                                },
+                            )
+                        ) {
+                            val color = it.arguments?.getInt("noteColor") ?: -1
+                            AddEditNoteScreen(
+                                navController = navController,
+                                noteColor = color
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt
new file mode 100644
index 00000000..84c80676
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt
@@ -0,0 +1,13 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+
+import androidx.compose.ui.focus.FocusState
+
+sealed class AddEditNoteEvent{
+    data class EnteredTitle(val value: String): AddEditNoteEvent()
+    data class ChangeTitleFocus(val focusState: FocusState): AddEditNoteEvent()
+    data class EnteredContent(val value: String): AddEditNoteEvent()
+    data class ChangeContentFocus(val focusState: FocusState): AddEditNoteEvent()
+    data class ChangeColor(val color: Int): AddEditNoteEvent()
+    object SaveNote: AddEditNoteEvent()
+}
+
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
new file mode 100644
index 00000000..b10edd1e
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
@@ -0,0 +1,147 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+
+import androidx.compose.animation.Animatable
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Save
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavController
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.components.TransparentHintTextField
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+@Composable
+fun AddEditNoteScreen(
+    navController: NavController,
+    noteColor: Int,
+    viewModel: AddEditNoteViewModel = hiltViewModel()
+) {
+    val titleState = viewModel.noteTitle.value
+    val contentState = viewModel.noteContent.value
+
+    val scaffoldState = rememberScaffoldState()
+
+    val noteBackgroundAnimatable = remember {
+        Animatable(
+            Color(if (noteColor != -1) noteColor else viewModel.noteColor.value)
+        )
+    }
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(key1 = true) {
+        viewModel.eventFlow.collectLatest { event ->
+            when(event) {
+                is AddEditNoteViewModel.UiEvent.ShowSnackbar -> {
+                    scaffoldState.snackbarHostState.showSnackbar(
+                        message = event.message
+                    )
+                }
+                is AddEditNoteViewModel.UiEvent.SaveNote -> {
+                    navController.navigateUp()
+                }
+            }
+        }
+    }
+
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    viewModel.onEvent(AddEditNoteEvent.SaveNote)
+                },
+                backgroundColor = MaterialTheme.colors.primary
+            ) {
+                Icon(imageVector = Icons.Default.Save, contentDescription = "Save note")
+            }
+        },
+        scaffoldState = scaffoldState
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(noteBackgroundAnimatable.value)
+                .padding(16.dp)
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(8.dp),
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                Note.noteColors.forEach { color ->
+                    val colorInt = color.toArgb()
+                    Box(
+                        modifier = Modifier
+                            .size(50.dp)
+                            .shadow(15.dp, CircleShape)
+                            .clip(CircleShape)
+                            .background(color)
+                            .border(
+                                width = 3.dp,
+                                color = if (viewModel.noteColor.value == colorInt) {
+                                    Color.Black
+                                } else Color.Transparent,
+                                shape = CircleShape
+                            )
+                            .clickable {
+                                scope.launch {
+                                    noteBackgroundAnimatable.animateTo(
+                                        targetValue = Color(colorInt),
+                                        animationSpec = tween(
+                                            durationMillis = 500
+                                        )
+                                    )
+                                }
+                                viewModel.onEvent(AddEditNoteEvent.ChangeColor(colorInt))
+                            }
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.height(16.dp))
+            TransparentHintTextField(
+                text = titleState.text,
+                hint = titleState.hint,
+                onValueChange = {
+                    viewModel.onEvent(AddEditNoteEvent.EnteredTitle(it))
+                },
+                onFocusChange = {
+                    viewModel.onEvent(AddEditNoteEvent.ChangeTitleFocus(it))
+                },
+                isHintVisible = titleState.isHintVisible,
+                singleLine = true,
+                textStyle = MaterialTheme.typography.h5
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            TransparentHintTextField(
+                text = contentState.text,
+                hint = contentState.hint,
+                onValueChange = {
+                    viewModel.onEvent(AddEditNoteEvent.EnteredContent(it))
+                },
+                onFocusChange = {
+                    viewModel.onEvent(AddEditNoteEvent.ChangeContentFocus(it))
+                },
+                isHintVisible = contentState.isHintVisible,
+                textStyle = MaterialTheme.typography.body1,
+                modifier = Modifier.fillMaxHeight()
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt
new file mode 100644
index 00000000..147aecf4
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt
@@ -0,0 +1,119 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.graphics.toArgb
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.InvalidNoteException
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.NoteUseCases
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class AddEditNoteViewModel @Inject constructor(
+    private val noteUseCases: NoteUseCases,
+    savedStateHandle: SavedStateHandle
+) : ViewModel() {
+
+    private val _noteTitle = mutableStateOf(NoteTextFieldState(
+        hint = "Enter title..."
+    ))
+    val noteTitle: State<NoteTextFieldState> = _noteTitle
+
+    private val _noteContent = mutableStateOf(NoteTextFieldState(
+        hint = "Enter some content"
+    ))
+    val noteContent: State<NoteTextFieldState> = _noteContent
+
+    private val _noteColor = mutableStateOf(Note.noteColors.random().toArgb())
+    val noteColor: State<Int> = _noteColor
+
+    private val _eventFlow = MutableSharedFlow<UiEvent>()
+    val eventFlow = _eventFlow.asSharedFlow()
+
+    private var currentNoteId: Int? = null
+
+    init {
+        savedStateHandle.get<Int>("noteId")?.let { noteId ->
+            if(noteId != -1) {
+                viewModelScope.launch {
+                    noteUseCases.getNote(noteId)?.also { note ->
+                        currentNoteId = note.id
+                        _noteTitle.value = noteTitle.value.copy(
+                            text = note.title,
+                            isHintVisible = false
+                        )
+                        _noteContent.value = _noteContent.value.copy(
+                            text = note.content,
+                            isHintVisible = false
+                        )
+                        _noteColor.value = note.color
+                    }
+                }
+            }
+        }
+    }
+
+    fun onEvent(event: AddEditNoteEvent) {
+        when(event) {
+            is AddEditNoteEvent.EnteredTitle -> {
+                _noteTitle.value = noteTitle.value.copy(
+                    text = event.value
+                )
+            }
+            is AddEditNoteEvent.ChangeTitleFocus -> {
+                _noteTitle.value = noteTitle.value.copy(
+                    isHintVisible = !event.focusState.isFocused &&
+                            noteTitle.value.text.isBlank()
+                )
+            }
+            is AddEditNoteEvent.EnteredContent -> {
+                _noteContent.value = _noteContent.value.copy(
+                    text = event.value
+                )
+            }
+            is AddEditNoteEvent.ChangeContentFocus -> {
+                _noteContent.value = _noteContent.value.copy(
+                    isHintVisible = !event.focusState.isFocused &&
+                            _noteContent.value.text.isBlank()
+                )
+            }
+            is AddEditNoteEvent.ChangeColor -> {
+                _noteColor.value = event.color
+            }
+            is AddEditNoteEvent.SaveNote -> {
+                viewModelScope.launch {
+                    try {
+                        noteUseCases.addNote(
+                            Note(
+                                title = noteTitle.value.text,
+                                content = noteContent.value.text,
+                                timestamp = System.currentTimeMillis(),
+                                color = noteColor.value,
+                                id = currentNoteId
+                            )
+                        )
+                        _eventFlow.emit(UiEvent.SaveNote)
+                    } catch(e: InvalidNoteException) {
+                        _eventFlow.emit(
+                            UiEvent.ShowSnackbar(
+                                message = e.message ?: "Couldn't save note"
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    sealed class UiEvent {
+        data class ShowSnackbar(val message: String): UiEvent()
+        object SaveNote: UiEvent()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
new file mode 100644
index 00000000..6a488bca
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
@@ -0,0 +1,7 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+
+data class NoteTextFieldState(
+    val text: String = "",
+    val hint: String = "",
+    val isHintVisible: Boolean = true
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
new file mode 100644
index 00000000..58f9e0d9
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
@@ -0,0 +1,43 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.components
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusState
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+
+@Composable
+fun TransparentHintTextField(
+    text: String,
+    hint: String,
+    modifier: Modifier = Modifier,
+    isHintVisible: Boolean = true,
+    onValueChange: (String) -> Unit,
+    textStyle: TextStyle = TextStyle(),
+    singleLine: Boolean = false,
+    onFocusChange: (FocusState) -> Unit
+) {
+    Box(
+        modifier = modifier
+    ) {
+        BasicTextField(
+            value = text,
+            onValueChange = onValueChange,
+            singleLine = singleLine,
+            textStyle = textStyle,
+            modifier = Modifier
+                .fillMaxWidth()
+                .onFocusChanged {
+                    onFocusChange(it)
+                }
+        )
+        if(isHintVisible) {
+            Text(text = hint, style = textStyle, color = Color.DarkGray)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
new file mode 100644
index 00000000..624c0634
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
@@ -0,0 +1,11 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
+
+sealed class NotesEvent {
+    data class Order(val noteOrder: NoteOrder): NotesEvent()
+    data class DeleteNote(val note: Note): NotesEvent()
+    object RestoreNote: NotesEvent()
+    object ToggleOrderSection: NotesEvent()
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
new file mode 100644
index 00000000..99724980
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
@@ -0,0 +1,118 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
+
+import androidx.compose.animation.*
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Sort
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavController
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components.NoteItem
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components.OrderSection
+import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util.Screen
+import kotlinx.coroutines.launch
+
+@ExperimentalAnimationApi
+@Composable
+fun NotesScreen(
+    navController: NavController,
+    viewModel: NotesViewModel = hiltViewModel()
+) {
+    val state = viewModel.state.value
+    val scaffoldState = rememberScaffoldState()
+    val scope = rememberCoroutineScope()
+
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    navController.navigate(Screen.AddEditNoteScreen.route)
+                },
+                backgroundColor = MaterialTheme.colors.primary
+            ) {
+                Icon(imageVector = Icons.Default.Add, contentDescription = "Add note")
+            }
+        },
+        scaffoldState = scaffoldState
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp)
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = "Your note",
+                    style = MaterialTheme.typography.h4
+                )
+                IconButton(
+                    onClick = {
+                        viewModel.onEvent(NotesEvent.ToggleOrderSection)
+                    },
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Sort,
+                        contentDescription = "Sort"
+                    )
+                }
+            }
+            AnimatedVisibility(
+                visible = state.isOrderSectionVisible,
+                enter = fadeIn() + slideInVertically(),
+                exit = fadeOut() + slideOutVertically()
+            ) {
+                OrderSection(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 16.dp),
+                    noteOrder = state.noteOrder,
+                    onOrderChange = {
+                        viewModel.onEvent(NotesEvent.Order(it))
+                    }
+                )
+            }
+            Spacer(modifier = Modifier.height(16.dp))
+            LazyColumn(modifier = Modifier.fillMaxSize()) {
+                items(state.notes) { note ->
+                    NoteItem(
+                        note = note,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable {
+                                navController.navigate(
+                                    Screen.AddEditNoteScreen.route +
+                                            "?noteId=${note.id}&noteColor=${note.color}"
+                                )
+                            },
+                        onDeleteClick = {
+                            viewModel.onEvent(NotesEvent.DeleteNote(note))
+                            scope.launch {
+                                val result = scaffoldState.snackbarHostState.showSnackbar(
+                                    message = "Note deleted",
+                                    actionLabel = "Undo"
+                                )
+                                if(result == SnackbarResult.ActionPerformed) {
+                                    viewModel.onEvent(NotesEvent.RestoreNote)
+                                }
+                            }
+                        }
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
new file mode 100644
index 00000000..d85bfdc2
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
@@ -0,0 +1,11 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
+
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+
+data class NotesState(
+    val notes: List<Note> = emptyList(),
+    val noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
+    val isOrderSectionVisible: Boolean = false
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt
new file mode 100644
index 00000000..bd11c8d6
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt
@@ -0,0 +1,75 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.NoteUseCases
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class NotesViewModel @Inject constructor(
+    private val noteUseCases: NoteUseCases
+) : ViewModel() {
+
+    private val _state = mutableStateOf(NotesState())
+    val state: State<NotesState> = _state
+
+    private var recentlyDeletedNote: Note? = null
+
+    private var getNotesJob: Job? = null
+
+    init {
+        getNotes(NoteOrder.Date(OrderType.Descending))
+    }
+
+    fun onEvent(event: NotesEvent) {
+        when (event) {
+            is NotesEvent.Order -> {
+                if (state.value.noteOrder::class == event.noteOrder::class &&
+                    state.value.noteOrder.orderType == event.noteOrder.orderType
+                ) {
+                    return
+                }
+                getNotes(event.noteOrder)
+            }
+            is NotesEvent.DeleteNote -> {
+                viewModelScope.launch {
+                    noteUseCases.deleteNote(event.note)
+                    recentlyDeletedNote = event.note
+                }
+            }
+            is NotesEvent.RestoreNote -> {
+                viewModelScope.launch {
+                    noteUseCases.addNote(recentlyDeletedNote ?: return@launch)
+                    recentlyDeletedNote = null
+                }
+            }
+            is NotesEvent.ToggleOrderSection -> {
+                _state.value = state.value.copy(
+                    isOrderSectionVisible = !state.value.isOrderSectionVisible
+                )
+            }
+        }
+    }
+
+    private fun getNotes(noteOrder: NoteOrder) {
+        getNotesJob?.cancel()
+        getNotesJob = noteUseCases.getNotes(noteOrder)
+            .onEach { notes ->
+                _state.value = state.value.copy(
+                    notes = notes,
+                    noteOrder = noteOrder
+                )
+            }
+            .launchIn(viewModelScope)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
new file mode 100644
index 00000000..2f5c5ce3
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
@@ -0,0 +1,37 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.RadioButton
+import androidx.compose.material.RadioButtonDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun DefaultRadioButton(
+    text: String,
+    selected: Boolean,
+    onSelect: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        RadioButton(
+            selected = selected,
+            onClick = onSelect,
+            colors = RadioButtonDefaults.colors(
+                selectedColor = MaterialTheme.colors.primary,
+                unselectedColor = MaterialTheme.colors.onBackground
+            )
+        )
+        Spacer(modifier = Modifier.width(8.dp))
+        Text(text = text, style = MaterialTheme.typography.body1)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
new file mode 100644
index 00000000..6be437c9
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
@@ -0,0 +1,95 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.clipPath
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.core.graphics.ColorUtils
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+
+@Composable
+fun NoteItem(
+    note: Note,
+    modifier: Modifier = Modifier,
+    cornerRadius: Dp = 10.dp,
+    cutCornerSize: Dp = 30.dp,
+    onDeleteClick: () -> Unit
+) {
+    Box(
+        modifier = modifier
+    ) {
+        Canvas(modifier = Modifier.matchParentSize()) {
+            val clipPath = Path().apply {
+                lineTo(size.width - cutCornerSize.toPx(), 0f)
+                lineTo(size.width, cutCornerSize.toPx())
+                lineTo(size.width, size.height)
+                lineTo(0f, size.height)
+                close()
+            }
+
+            clipPath(clipPath) {
+                drawRoundRect(
+                    color = Color(note.color),
+                    size = size,
+                    cornerRadius = CornerRadius(cornerRadius.toPx())
+                )
+                drawRoundRect(
+                    color = Color(
+                        ColorUtils.blendARGB(note.color, 0x000000, 0.2f)
+                    ),
+                    topLeft = Offset(size.width - cutCornerSize.toPx(), -100f),
+                    size = Size(cutCornerSize.toPx() + 100f, cutCornerSize.toPx() + 100f),
+                    cornerRadius = CornerRadius(cornerRadius.toPx())
+                )
+            }
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp)
+                .padding(end = 32.dp)
+        ) {
+            Text(
+                text = note.title,
+                style = MaterialTheme.typography.h6,
+                color = MaterialTheme.colors.onSurface,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            Text(
+                text = note.content,
+                style = MaterialTheme.typography.body1,
+                color = MaterialTheme.colors.onSurface,
+                maxLines = 10,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+        IconButton(
+            onClick = onDeleteClick,
+            modifier = Modifier.align(Alignment.BottomEnd)
+        ) {
+            Icon(
+                imageVector = Icons.Default.Delete,
+                contentDescription = "Delete note",
+                tint = MaterialTheme.colors.onSurface
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt
new file mode 100644
index 00000000..0fdc3634
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt
@@ -0,0 +1,61 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+
+@Composable
+fun OrderSection(
+    modifier: Modifier = Modifier,
+    noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
+    onOrderChange: (NoteOrder) -> Unit
+) {
+    Column(
+        modifier = modifier
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            DefaultRadioButton(
+                text = "Title",
+                selected = noteOrder is NoteOrder.Title,
+                onSelect = { onOrderChange(NoteOrder.Title(noteOrder.orderType)) }
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            DefaultRadioButton(
+                text = "Date",
+                selected = noteOrder is NoteOrder.Date,
+                onSelect = { onOrderChange(NoteOrder.Date(noteOrder.orderType)) }
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            DefaultRadioButton(
+                text = "Color",
+                selected = noteOrder is NoteOrder.Color,
+                onSelect = { onOrderChange(NoteOrder.Color(noteOrder.orderType)) }
+            )
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+        Row(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            DefaultRadioButton(
+                text = "Ascending",
+                selected = noteOrder.orderType is OrderType.Ascending,
+                onSelect = {
+                    onOrderChange(noteOrder.copy(OrderType.Ascending))
+                }
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            DefaultRadioButton(
+                text = "Descending",
+                selected = noteOrder.orderType is OrderType.Descending,
+                onSelect = {
+                    onOrderChange(noteOrder.copy(OrderType.Descending))
+                }
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt
new file mode 100644
index 00000000..9a0e1d1e
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt
@@ -0,0 +1,6 @@
+package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util
+
+sealed class Screen(val route: String) {
+    object NotesScreen: Screen("notes_screen")
+    object AddEditNoteScreen: Screen("add_edit_note_screen")
+}

From 4c27db73a2a9f96c494d229f121d6a6784f9eb71 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Wed, 13 Nov 2024 00:09:27 +0300
Subject: [PATCH 02/14] build.gradle converted to kts.

---
 .idea/deploymentTargetSelector.xml            | 10 +++
 .idea/gradle.xml                              |  6 +-
 .idea/misc.xml                                |  2 +-
 .idea/runConfigurations.xml                   | 17 ++++
 app/build.gradle                              | 90 -------------------
 app/build.gradle.kts                          | 87 ++++++++++++++++++
 app/proguard-rules.pro                        |  2 +-
 .../feature_note/domain/model/Note.kt         |  2 +-
 .../feature_note/presentation/MainActivity.kt |  9 +-
 .../add_edit_note/AddEditNoteScreen.kt        | 20 ++---
 .../components/TransparentHintTextField.kt    |  2 +-
 .../presentation/notes/NotesScreen.kt         | 19 ++--
 .../notes/components/DefaultRadioButton.kt    | 14 +--
 .../presentation/notes/components/NoteItem.kt | 18 ++--
 .../ui/theme/Shape.kt                         |  2 +-
 .../ui/theme/Theme.kt                         |  8 +-
 .../cleanarchitecturenoteapp/ui/theme/Type.kt |  4 +-
 app/src/main/res/values-night/themes.xml      | 14 ---
 app/src/main/res/values/themes.xml            | 27 +-----
 build.gradle                                  | 22 -----
 build.gradle.kts                              |  7 ++
 gradle.properties                             |  3 +-
 gradle/libs.versions.toml                     | 32 +++++++
 gradle/wrapper/gradle-wrapper.properties      |  6 +-
 settings.gradle                               | 10 ---
 settings.gradle.kts                           | 23 +++++
 26 files changed, 236 insertions(+), 220 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/runConfigurations.xml
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 app/src/main/res/values-night/themes.xml
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 gradle/libs.versions.toml
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c25..ecd50f02 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66a..d5d35ec4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 5ec04ab2..00000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,90 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
-}
-
-android {
-    compileSdk 31
-
-    defaultConfig {
-        applicationId "com.plcoding.cleanarchitecturenoteapp"
-        minSdk 21
-        targetSdk 31
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        useIR = true
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion '1.5.21'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-
-    // Compose dependencies
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-beta01"
-    implementation "androidx.navigation:navigation-compose:2.4.0-alpha09"
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
-
-    // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'
-
-    //Dagger - Hilt
-    implementation "com.google.dagger:hilt-android:2.38.1"
-    kapt "com.google.dagger:hilt-android-compiler:2.37"
-    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
-    kapt "androidx.hilt:hilt-compiler:1.0.0"
-
-    // Room
-    implementation "androidx.room:room-runtime:2.3.0"
-    kapt "androidx.room:room-compiler:2.3.0"
-
-    // Kotlin Extensions and Coroutines support for Room
-    implementation "androidx.room:room-ktx:2.3.0"
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..c121e9f1
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,87 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+    namespace = "com.plcoding.cleanarchitecturenoteapp"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "com.plcoding.cleanarchitecturenoteapp"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
+    // Compose dependencies
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-beta01")
+    implementation("androidx.navigation:navigation-compose:2.8.3")
+    implementation("androidx.compose.material:material-icons-extended:1.7.5")
+    implementation("androidx.hilt:hilt-navigation-compose:1.0.0-alpha03")
+
+    // Coroutines
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1")
+
+    //Dagger - Hilt
+    implementation("com.google.dagger:hilt-android:2.49")
+    kapt("com.google.dagger:hilt-android-compiler:2.49")
+    kapt("androidx.hilt:hilt-compiler:1.0.0")
+
+    // Room
+    implementation("androidx.room:room-runtime:2.6.1")
+    kapt("androidx.room:room-compiler:2.6.1")
+
+    // Kotlin Extensions and Coroutines support for Room
+    implementation("androidx.room:room-ktx:2.6.1")
+}
+
+kapt {
+    correctErrorTypes = true
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb434..ff59496d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
index 68214ccd..b7473f7e 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
@@ -4,7 +4,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.plcoding.cleanarchitecturenoteapp.ui.theme.*
 
-@Entity
+@Entity(tableName = "note")
 data class Note(
     val title: String,
     val content: String,
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
index 850240ae..dd194689 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
@@ -4,11 +4,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -28,7 +25,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             CleanArchitectureNoteAppTheme {
                 Surface(
-                    color = MaterialTheme.colors.background
+                    color = MaterialTheme.colorScheme.background
                 ) {
                     val navController = rememberNavController()
                     NavHost(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
index b10edd1e..a8542ce0 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
+import androidx.compose.material3.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.runtime.Composable
@@ -36,7 +36,7 @@ fun AddEditNoteScreen(
     val titleState = viewModel.noteTitle.value
     val contentState = viewModel.noteContent.value
 
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     val noteBackgroundAnimatable = remember {
         Animatable(
@@ -49,7 +49,7 @@ fun AddEditNoteScreen(
         viewModel.eventFlow.collectLatest { event ->
             when(event) {
                 is AddEditNoteViewModel.UiEvent.ShowSnackbar -> {
-                    scaffoldState.snackbarHostState.showSnackbar(
+                    snackbarHostState.showSnackbar(
                         message = event.message
                     )
                 }
@@ -61,23 +61,23 @@ fun AddEditNoteScreen(
     }
 
     Scaffold(
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
                     viewModel.onEvent(AddEditNoteEvent.SaveNote)
                 },
-                backgroundColor = MaterialTheme.colors.primary
+                containerColor = MaterialTheme.colorScheme.primary
             ) {
                 Icon(imageVector = Icons.Default.Save, contentDescription = "Save note")
             }
-        },
-        scaffoldState = scaffoldState
-    ) {
+        }
+    ) { paddingValues ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
                 .background(noteBackgroundAnimatable.value)
-                .padding(16.dp)
+                .padding(paddingValues)
         ) {
             Row(
                 modifier = Modifier
@@ -126,7 +126,7 @@ fun AddEditNoteScreen(
                 },
                 isHintVisible = titleState.isHintVisible,
                 singleLine = true,
-                textStyle = MaterialTheme.typography.h5
+                textStyle = MaterialTheme.typography.headlineSmall
             )
             Spacer(modifier = Modifier.height(16.dp))
             TransparentHintTextField(
@@ -139,7 +139,7 @@ fun AddEditNoteScreen(
                     viewModel.onEvent(AddEditNoteEvent.ChangeContentFocus(it))
                 },
                 isHintVisible = contentState.isHintVisible,
-                textStyle = MaterialTheme.typography.body1,
+                textStyle = MaterialTheme.typography.bodyLarge,
                 modifier = Modifier.fillMaxHeight()
             )
         }
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
index 58f9e0d9..77f262e1 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
@@ -3,7 +3,7 @@ package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusState
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
index 99724980..08a547f5 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
@@ -5,11 +5,12 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.*
+import androidx.compose.material3.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Sort
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -28,26 +29,26 @@ fun NotesScreen(
     viewModel: NotesViewModel = hiltViewModel()
 ) {
     val state = viewModel.state.value
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val scope = rememberCoroutineScope()
 
     Scaffold(
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
                     navController.navigate(Screen.AddEditNoteScreen.route)
                 },
-                backgroundColor = MaterialTheme.colors.primary
+                containerColor = MaterialTheme.colorScheme.primary
             ) {
                 Icon(imageVector = Icons.Default.Add, contentDescription = "Add note")
             }
-        },
-        scaffoldState = scaffoldState
-    ) {
+        }
+    ) { paddingValues ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(16.dp)
+                .padding(paddingValues)
         ) {
             Row(
                 modifier = Modifier.fillMaxWidth(),
@@ -56,7 +57,7 @@ fun NotesScreen(
             ) {
                 Text(
                     text = "Your note",
-                    style = MaterialTheme.typography.h4
+                    style = MaterialTheme.typography.headlineMedium
                 )
                 IconButton(
                     onClick = {
@@ -100,7 +101,7 @@ fun NotesScreen(
                         onDeleteClick = {
                             viewModel.onEvent(NotesEvent.DeleteNote(note))
                             scope.launch {
-                                val result = scaffoldState.snackbarHostState.showSnackbar(
+                                val result = snackbarHostState.showSnackbar(
                                     message = "Note deleted",
                                     actionLabel = "Undo"
                                 )
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
index 2f5c5ce3..feb257e8 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
@@ -3,10 +3,10 @@ package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.co
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.RadioButton
-import androidx.compose.material.RadioButtonDefaults
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.RadioButtonDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -27,11 +27,11 @@ fun DefaultRadioButton(
             selected = selected,
             onClick = onSelect,
             colors = RadioButtonDefaults.colors(
-                selectedColor = MaterialTheme.colors.primary,
-                unselectedColor = MaterialTheme.colors.onBackground
+                selectedColor = MaterialTheme.colorScheme.primary,
+                unselectedColor = MaterialTheme.colorScheme.onBackground
             )
         )
         Spacer(modifier = Modifier.width(8.dp))
-        Text(text = text, style = MaterialTheme.typography.body1)
+        Text(text = text, style = MaterialTheme.typography.bodyLarge)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
index 6be437c9..790d0af4 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
@@ -2,10 +2,10 @@ package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.co
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.runtime.Composable
@@ -67,16 +67,16 @@ fun NoteItem(
         ) {
             Text(
                 text = note.title,
-                style = MaterialTheme.typography.h6,
-                color = MaterialTheme.colors.onSurface,
+                style = MaterialTheme.typography.headlineSmall,
+                color = MaterialTheme.colorScheme.onSurface,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
             Spacer(modifier = Modifier.height(8.dp))
             Text(
                 text = note.content,
-                style = MaterialTheme.typography.body1,
-                color = MaterialTheme.colors.onSurface,
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurface,
                 maxLines = 10,
                 overflow = TextOverflow.Ellipsis
             )
@@ -88,7 +88,7 @@ fun NoteItem(
             Icon(
                 imageVector = Icons.Default.Delete,
                 contentDescription = "Delete note",
-                tint = MaterialTheme.colors.onSurface
+                tint = MaterialTheme.colorScheme.onSurface
             )
         }
     }
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt
index 3a70048a..1f872ff6 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt
@@ -1,7 +1,7 @@
 package com.plcoding.cleanarchitecturenoteapp.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
+import androidx.compose.material3.Shapes
 import androidx.compose.ui.unit.dp
 
 val Shapes = Shapes(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
index 24a1508f..2c6e1c67 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
@@ -1,11 +1,11 @@
 package com.plcoding.cleanarchitecturenoteapp.ui.theme
 
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
-private val DarkColorPalette = darkColors(
+private val DarkColorPalette = darkColorScheme(
     primary = Color.White,
     background = DarkGray,
     onBackground = Color.White,
@@ -16,7 +16,7 @@ private val DarkColorPalette = darkColors(
 @Composable
 fun CleanArchitectureNoteAppTheme(darkTheme: Boolean = true, content: @Composable() () -> Unit) {
     MaterialTheme(
-        colors = DarkColorPalette,
+        colorScheme = DarkColorPalette,
         typography = Typography,
         shapes = Shapes,
         content = content
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt
index 4db73a88..e4befb58 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt
@@ -1,6 +1,6 @@
 package com.plcoding.cleanarchitecturenoteapp.ui.theme
 
-import androidx.compose.material.Typography
+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
@@ -8,7 +8,7 @@ import androidx.compose.ui.unit.sp
 
 // Set of Material typography styles to start with
 val Typography = Typography(
-    body1 = TextStyle(
+    bodyLarge = TextStyle(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 423caff1..00000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.CleanArchitectureNoteApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/black</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/dark_gray</item>
-        <!-- Customize your theme here. -->
-    </style>
-</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
index c2739918..3d0dccbe 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,26 +1,3 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.CleanArchitectureNoteApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/black</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/dark_gray</item>
-        <!-- Customize your theme here. -->
-
-
-    </style>
-
-    <style name="Theme.CleanArchitectureNoteApp.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.CleanArchTodoAppPrep.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.CleanArchTodoAppPrep.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
+<resources>
+    <style name="Theme.CleanArchitectureNoteApp" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 009f9c11..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext {
-        compose_version = '1.0.2'
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.38.1"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..6735ebdd
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,7 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    id("com.google.dagger.hilt.android") version "2.49" apply false
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 98bed167..65d0af8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+kapt.use.worker.api=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..133a0247
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,32 @@
+[versions]
+agp = "8.7.2"
+kotlin = "2.0.10"
+coreKtx = "1.15.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.7"
+activityCompose = "1.9.3"
+composeBom = "2024.10.01"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c56e3cf4..3074de35 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 17 20:48:52 CEST 2021
+#Tue Nov 12 23:45:49 TRT 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 5ce93cce..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
-    }
-}
-rootProject.name = "CleanArchitectureNoteApp"
-include ':app'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..26b99f65
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,23 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "CleanArchitectureNoteApp"
+include(":app")
\ No newline at end of file

From c195b7dd0d25d400bb78cbf79a8f9b66c4c9fe90 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Wed, 13 Nov 2024 01:12:41 +0300
Subject: [PATCH 03/14] Code refactored.

---
 .idea/.name                                   |   1 +
 .idea/compiler.xml                            |   2 +-
 .idea/inspectionProfiles/Project_Default.xml  |   2 +
 .idea/kotlinc.xml                             |   6 +
 .idea/migrations.xml                          |  10 +
 .idea/misc.xml                                |   2 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../cleanarchitecturenoteapp/MainActivity.kt  |  35 +++
 .../data/database/NoteDao.kt                  |  21 ++
 .../database}/NoteDatabase.kt                 |   7 +-
 .../domain => data}/model/Note.kt             |   2 +-
 .../data/repository/NoteRepositoryImpl.kt     |  27 +++
 .../cleanarchitecturenoteapp/di/AppModule.kt  |  45 ----
 .../di/DatabaseModule.kt                      |  27 +++
 .../di/RepositoryModule.kt                    |  21 ++
 .../di/UseCaseModule.kt                       |  29 +++
 .../domain/repository/NoteRepository.kt       |  15 ++
 .../use_case => domain/usecase}/AddNote.kt    |  13 +-
 .../domain/usecase/DeleteNote.kt              |  14 ++
 .../domain/usecase/GetNote.kt                 |  14 ++
 .../use_case => domain/usecase}/GetNotes.kt   |  15 +-
 .../usecase/NoteUseCase.kt}                   |   4 +-
 .../domain/util/NoteOrder.kt                  |   2 +-
 .../domain/util/OrderType.kt                  |   6 +
 .../feature_note/data/data_source/NoteDao.kt  |  21 --
 .../data/repository/NoteRepositoryImpl.kt     |  27 ---
 .../domain/repository/NoteRepository.kt       |  15 --
 .../domain/use_case/DeleteNote.kt             |  13 --
 .../feature_note/domain/use_case/GetNote.kt   |  13 --
 .../feature_note/domain/util/OrderType.kt     |   6 -
 .../feature_note/presentation/MainActivity.kt |  67 ------
 .../add_edit_note/NoteTextFieldState.kt       |   7 -
 .../presentation/notes/NotesEvent.kt          |  11 -
 .../presentation/notes/NotesScreen.kt         | 119 ----------
 .../presentation/notes/NotesState.kt          |  11 -
 .../presentation/notes/components/NoteItem.kt |  95 --------
 .../feature_note/presentation/util/Screen.kt  |   6 -
 .../component}/DefaultRadioButton.kt          |   2 +-
 .../component}/OrderSection.kt                |   6 +-
 .../component}/TransparentHintTextField.kt    |   2 +-
 .../ui/navigation/NoteNavigation.kt           |  50 +++++
 .../ui/navigation/NoteScreen.kt               |   6 +
 .../ui/theme/Color.kt                         |   1 +
 .../ui/theme/Theme.kt                         |  36 ++-
 .../view/edit}/AddEditNoteEvent.kt            |   4 +-
 .../view/edit}/AddEditNoteScreen.kt           |  23 +-
 .../view/edit}/AddEditNoteViewModel.kt        |  66 +++---
 .../ui/view/edit/NoteTextFieldState.kt        |   7 +
 .../ui/view/list/NoteListEvent.kt             |  11 +
 .../ui/view/list/NoteListScreen.kt            | 209 ++++++++++++++++++
 .../ui/view/list/NoteListState.kt             |  11 +
 .../view/list/NoteListViewModel.kt}           |  37 ++--
 52 files changed, 654 insertions(+), 550 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/migrations.xml
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/data/data_source => data/database}/NoteDatabase.kt (61%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/domain => data}/model/Note.kt (86%)
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/domain/use_case => domain/usecase}/AddNote.kt (50%)
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/domain/use_case => domain/usecase}/GetNotes.kt (69%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/domain/use_case/NoteUseCases.kt => domain/usecase/NoteUseCase.kt} (53%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note => }/domain/util/NoteOrder.kt (86%)
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/notes/components => ui/component}/DefaultRadioButton.kt (92%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/notes/components => ui/component}/OrderSection.kt (88%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/add_edit_note/components => ui/component}/TransparentHintTextField.kt (92%)
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/add_edit_note => ui/view/edit}/AddEditNoteEvent.kt (77%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/add_edit_note => ui/view/edit}/AddEditNoteScreen.kt (89%)
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/add_edit_note => ui/view/edit}/AddEditNoteViewModel.kt (62%)
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
 create mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
 rename app/src/main/java/com/plcoding/cleanarchitecturenoteapp/{feature_note/presentation/notes/NotesViewModel.kt => ui/view/list/NoteListViewModel.kt} (62%)

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..ef8486eb
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+CleanArchitectureNoteApp
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8a..b589d56e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 28422375..a269cb1a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,12 +2,14 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..5815a4a6
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.0.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec4..55c0ec2c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88340904..34168768 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.CleanArchitectureNoteApp">
         <activity
-            android:name=".feature_note.presentation.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.CleanArchitectureNoteApp">
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
new file mode 100644
index 00000000..a53ba7e4
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
@@ -0,0 +1,35 @@
+package com.plcoding.cleanarchitecturenoteapp
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.plcoding.cleanarchitecturenoteapp.ui.navigation.NoteNavigation
+import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    @ExperimentalAnimationApi
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CleanArchitectureNoteAppTheme {
+                Scaffold (
+                    modifier = Modifier.fillMaxSize()
+                ) { paddingValues ->
+                    NoteNavigation(
+                        modifier = Modifier.fillMaxSize().padding(paddingValues)
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt
new file mode 100644
index 00000000..db4f329e
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt
@@ -0,0 +1,21 @@
+package com.plcoding.cleanarchitecturenoteapp.data.database
+
+import androidx.room.*
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface NoteDao {
+
+    @Query("SELECT * FROM note")
+    fun getAllNoteDatabase(): Flow<List<Note>>
+
+    @Query("SELECT * FROM note WHERE id = :id")
+    suspend fun getSingleNoteDatabase(id: Int): Note?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertNoteDatabase(note: Note)
+
+    @Delete
+    suspend fun deleteNoteDatabase(note: Note)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt
similarity index 61%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt
index 4dd871af..e90f45f7 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDatabase.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt
@@ -1,12 +1,13 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source
+package com.plcoding.cleanarchitecturenoteapp.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
 
 @Database(
     entities = [Note::class],
-    version = 1
+    version = 1,
+    exportSchema = false
 )
 abstract class NoteDatabase: RoomDatabase() {
 
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt
similarity index 86%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt
index b7473f7e..e29b6853 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/model/Note.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model
+package com.plcoding.cleanarchitecturenoteapp.data.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt
new file mode 100644
index 00000000..e29bb226
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt
@@ -0,0 +1,27 @@
+package com.plcoding.cleanarchitecturenoteapp.data.repository
+
+import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDao
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import kotlinx.coroutines.flow.Flow
+
+class NoteRepositoryImpl(
+    private val noteDao: NoteDao
+) : NoteRepository {
+
+    override fun getAllNoteRepository(): Flow<List<Note>> {
+        return noteDao.getAllNoteDatabase()
+    }
+
+    override suspend fun getSingleNoteRepository(id: Int): Note? {
+        return noteDao.getSingleNoteDatabase(id)
+    }
+
+    override suspend fun insertNoteRepository(note: Note) {
+        noteDao.insertNoteDatabase(note)
+    }
+
+    override suspend fun deleteNoteRepository(note: Note) {
+        noteDao.deleteNoteDatabase(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
deleted file mode 100644
index 92660b5f..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/AppModule.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.di
-
-import android.app.Application
-import androidx.room.Room
-import com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source.NoteDatabase
-import com.plcoding.cleanarchitecturenoteapp.feature_note.data.repository.NoteRepositoryImpl
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.*
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object AppModule {
-
-    @Provides
-    @Singleton
-    fun provideNoteDatabase(app: Application): NoteDatabase {
-        return Room.databaseBuilder(
-            app,
-            NoteDatabase::class.java,
-            NoteDatabase.DATABASE_NAME
-        ).build()
-    }
-
-    @Provides
-    @Singleton
-    fun provideNoteRepository(db: NoteDatabase): NoteRepository {
-        return NoteRepositoryImpl(db.noteDao)
-    }
-
-    @Provides
-    @Singleton
-    fun provideNoteUseCases(repository: NoteRepository): NoteUseCases {
-        return NoteUseCases(
-            getNotes = GetNotes(repository),
-            deleteNote = DeleteNote(repository),
-            addNote = AddNote(repository),
-            getNote = GetNote(repository)
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt
new file mode 100644
index 00000000..a52384a6
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt
@@ -0,0 +1,27 @@
+package com.plcoding.cleanarchitecturenoteapp.di
+
+import android.app.Application
+import android.content.Context
+import androidx.room.Room
+import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDatabase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+    @Provides
+    @Singleton
+    fun provideNoteDatabase(@ApplicationContext context: Context): NoteDatabase {
+        return Room.databaseBuilder(
+            context,
+            NoteDatabase::class.java,
+            NoteDatabase.DATABASE_NAME
+        ).build()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt
new file mode 100644
index 00000000..ef835ddc
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt
@@ -0,0 +1,21 @@
+package com.plcoding.cleanarchitecturenoteapp.di
+
+import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDatabase
+import com.plcoding.cleanarchitecturenoteapp.data.repository.NoteRepositoryImpl
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+
+    @Provides
+    @Singleton
+    fun provideNoteRepository(noteDatabase: NoteDatabase): NoteRepository {
+        return NoteRepositoryImpl(noteDatabase.noteDao)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt
new file mode 100644
index 00000000..fbaa6798
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt
@@ -0,0 +1,29 @@
+package com.plcoding.cleanarchitecturenoteapp.di
+
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.AddNote
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.DeleteNote
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.GetNote
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.GetNotes
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object UseCaseModule {
+
+    @Provides
+    @Singleton
+    fun provideNoteUseCases(repository: NoteRepository): NoteUseCase {
+        return NoteUseCase(
+            getNotes = GetNotes(repository),
+            deleteNote = DeleteNote(repository),
+            addNote = AddNote(repository),
+            getNote = GetNote(repository)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt
new file mode 100644
index 00000000..0efb28de
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt
@@ -0,0 +1,15 @@
+package com.plcoding.cleanarchitecturenoteapp.domain.repository
+
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import kotlinx.coroutines.flow.Flow
+
+interface NoteRepository {
+
+    fun getAllNoteRepository(): Flow<List<Note>>
+
+    suspend fun getSingleNoteRepository(id: Int): Note?
+
+    suspend fun insertNoteRepository(note: Note)
+
+    suspend fun deleteNoteRepository(note: Note)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt
similarity index 50%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt
index 5e243dff..912ef7d3 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/AddNote.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt
@@ -1,10 +1,11 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+package com.plcoding.cleanarchitecturenoteapp.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.InvalidNoteException
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
+import com.plcoding.cleanarchitecturenoteapp.data.model.InvalidNoteException
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import javax.inject.Inject
 
-class AddNote(
+class AddNote @Inject constructor(
     private val repository: NoteRepository
 ) {
 
@@ -16,6 +17,6 @@ class AddNote(
         if(note.content.isBlank()) {
             throw InvalidNoteException("The content of the note can't be empty.")
         }
-        repository.insertNote(note)
+        repository.insertNoteRepository(note)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt
new file mode 100644
index 00000000..51e7ab23
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt
@@ -0,0 +1,14 @@
+package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import javax.inject.Inject
+
+class DeleteNote @Inject constructor(
+    private val repository: NoteRepository
+) {
+
+    suspend operator fun invoke(note: Note) {
+        repository.deleteNoteRepository(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt
new file mode 100644
index 00000000..c6781d29
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt
@@ -0,0 +1,14 @@
+package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import javax.inject.Inject
+
+class GetNote @Inject constructor(
+    private val repository: NoteRepository
+) {
+
+    suspend operator fun invoke(id: Int): Note? {
+        return repository.getSingleNoteRepository(id)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt
similarity index 69%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt
index ac94e18f..cd878f20 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNotes.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt
@@ -1,20 +1,21 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+package com.plcoding.cleanarchitecturenoteapp.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
-class GetNotes(
+class GetNotes @Inject constructor(
     private val repository: NoteRepository
 ) {
 
     operator fun invoke(
         noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending)
     ): Flow<List<Note>> {
-        return repository.getNotes().map { notes ->
+        return repository.getAllNoteRepository().map { notes ->
             when(noteOrder.orderType) {
                 is OrderType.Ascending -> {
                     when(noteOrder) {
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt
similarity index 53%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt
index a89b00c1..9addeb7d 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/NoteUseCases.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt
@@ -1,6 +1,6 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
+package com.plcoding.cleanarchitecturenoteapp.domain.usecase
 
-data class NoteUseCases(
+data class NoteUseCase(
     val getNotes: GetNotes,
     val deleteNote: DeleteNote,
     val addNote: AddNote,
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt
similarity index 86%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt
index eb7fa913..aad4dd2b 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/NoteOrder.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util
+package com.plcoding.cleanarchitecturenoteapp.domain.util
 
 sealed class NoteOrder(val orderType: OrderType) {
     class Title(orderType: OrderType): NoteOrder(orderType)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt
new file mode 100644
index 00000000..dbc32331
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt
@@ -0,0 +1,6 @@
+package com.plcoding.cleanarchitecturenoteapp.domain.util
+
+sealed class OrderType {
+    data object Ascending: OrderType()
+    data object Descending: OrderType()
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
deleted file mode 100644
index fdcb3405..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/data_source/NoteDao.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source
-
-import androidx.room.*
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface NoteDao {
-
-    @Query("SELECT * FROM note")
-    fun getNotes(): Flow<List<Note>>
-
-    @Query("SELECT * FROM note WHERE id = :id")
-    suspend fun getNoteById(id: Int): Note?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertNote(note: Note)
-
-    @Delete
-    suspend fun deleteNote(note: Note)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
deleted file mode 100644
index 39d93125..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/data/repository/NoteRepositoryImpl.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.data.repository
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.data.data_source.NoteDao
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
-import kotlinx.coroutines.flow.Flow
-
-class NoteRepositoryImpl(
-    private val dao: NoteDao
-) : NoteRepository {
-
-    override fun getNotes(): Flow<List<Note>> {
-        return dao.getNotes()
-    }
-
-    override suspend fun getNoteById(id: Int): Note? {
-        return dao.getNoteById(id)
-    }
-
-    override suspend fun insertNote(note: Note) {
-        dao.insertNote(note)
-    }
-
-    override suspend fun deleteNote(note: Note) {
-        dao.deleteNote(note)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
deleted file mode 100644
index 471b748a..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/repository/NoteRepository.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import kotlinx.coroutines.flow.Flow
-
-interface NoteRepository {
-
-    fun getNotes(): Flow<List<Note>>
-
-    suspend fun getNoteById(id: Int): Note?
-
-    suspend fun insertNote(note: Note)
-
-    suspend fun deleteNote(note: Note)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
deleted file mode 100644
index e57acdfe..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/DeleteNote.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
-
-class DeleteNote(
-    private val repository: NoteRepository
-) {
-
-    suspend operator fun invoke(note: Note) {
-        repository.deleteNote(note)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
deleted file mode 100644
index 84e8978c..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/use_case/GetNote.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.repository.NoteRepository
-
-class GetNote(
-    private val repository: NoteRepository
-) {
-
-    suspend operator fun invoke(id: Int): Note? {
-        return repository.getNoteById(id)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
deleted file mode 100644
index de897a19..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/domain/util/OrderType.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util
-
-sealed class OrderType {
-    object Ascending: OrderType()
-    object Descending: OrderType()
-}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
deleted file mode 100644
index dd194689..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/MainActivity.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.navigation.NavType
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.AddEditNoteScreen
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.NotesScreen
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util.Screen
-import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class MainActivity : ComponentActivity() {
-    @ExperimentalAnimationApi
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            CleanArchitectureNoteAppTheme {
-                Surface(
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    val navController = rememberNavController()
-                    NavHost(
-                        navController = navController,
-                        startDestination = Screen.NotesScreen.route
-                    ) {
-                        composable(route = Screen.NotesScreen.route) {
-                            NotesScreen(navController = navController)
-                        }
-                        composable(
-                            route = Screen.AddEditNoteScreen.route +
-                                    "?noteId={noteId}&noteColor={noteColor}",
-                            arguments = listOf(
-                                navArgument(
-                                    name = "noteId"
-                                ) {
-                                    type = NavType.IntType
-                                    defaultValue = -1
-                                },
-                                navArgument(
-                                    name = "noteColor"
-                                ) {
-                                    type = NavType.IntType
-                                    defaultValue = -1
-                                },
-                            )
-                        ) {
-                            val color = it.arguments?.getInt("noteColor") ?: -1
-                            AddEditNoteScreen(
-                                navController = navController,
-                                noteColor = color
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
deleted file mode 100644
index 6a488bca..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/NoteTextFieldState.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
-
-data class NoteTextFieldState(
-    val text: String = "",
-    val hint: String = "",
-    val isHintVisible: Boolean = true
-)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
deleted file mode 100644
index 624c0634..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
-
-sealed class NotesEvent {
-    data class Order(val noteOrder: NoteOrder): NotesEvent()
-    data class DeleteNote(val note: Note): NotesEvent()
-    object RestoreNote: NotesEvent()
-    object ToggleOrderSection: NotesEvent()
-}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
deleted file mode 100644
index 08a547f5..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesScreen.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
-
-import androidx.compose.animation.*
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Sort
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components.NoteItem
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components.OrderSection
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util.Screen
-import kotlinx.coroutines.launch
-
-@ExperimentalAnimationApi
-@Composable
-fun NotesScreen(
-    navController: NavController,
-    viewModel: NotesViewModel = hiltViewModel()
-) {
-    val state = viewModel.state.value
-    val snackbarHostState = remember { SnackbarHostState() }
-    val scope = rememberCoroutineScope()
-
-    Scaffold(
-        snackbarHost = { SnackbarHost(snackbarHostState) },
-        floatingActionButton = {
-            FloatingActionButton(
-                onClick = {
-                    navController.navigate(Screen.AddEditNoteScreen.route)
-                },
-                containerColor = MaterialTheme.colorScheme.primary
-            ) {
-                Icon(imageVector = Icons.Default.Add, contentDescription = "Add note")
-            }
-        }
-    ) { paddingValues ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = "Your note",
-                    style = MaterialTheme.typography.headlineMedium
-                )
-                IconButton(
-                    onClick = {
-                        viewModel.onEvent(NotesEvent.ToggleOrderSection)
-                    },
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Sort,
-                        contentDescription = "Sort"
-                    )
-                }
-            }
-            AnimatedVisibility(
-                visible = state.isOrderSectionVisible,
-                enter = fadeIn() + slideInVertically(),
-                exit = fadeOut() + slideOutVertically()
-            ) {
-                OrderSection(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(vertical = 16.dp),
-                    noteOrder = state.noteOrder,
-                    onOrderChange = {
-                        viewModel.onEvent(NotesEvent.Order(it))
-                    }
-                )
-            }
-            Spacer(modifier = Modifier.height(16.dp))
-            LazyColumn(modifier = Modifier.fillMaxSize()) {
-                items(state.notes) { note ->
-                    NoteItem(
-                        note = note,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable {
-                                navController.navigate(
-                                    Screen.AddEditNoteScreen.route +
-                                            "?noteId=${note.id}&noteColor=${note.color}"
-                                )
-                            },
-                        onDeleteClick = {
-                            viewModel.onEvent(NotesEvent.DeleteNote(note))
-                            scope.launch {
-                                val result = snackbarHostState.showSnackbar(
-                                    message = "Note deleted",
-                                    actionLabel = "Undo"
-                                )
-                                if(result == SnackbarResult.ActionPerformed) {
-                                    viewModel.onEvent(NotesEvent.RestoreNote)
-                                }
-                            }
-                        }
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
deleted file mode 100644
index d85bfdc2..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesState.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
-
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
-
-data class NotesState(
-    val notes: List<Note> = emptyList(),
-    val noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
-    val isOrderSectionVisible: Boolean = false
-)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
deleted file mode 100644
index 790d0af4..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/NoteItem.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
-
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Path
-import androidx.compose.ui.graphics.drawscope.clipPath
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.core.graphics.ColorUtils
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-
-@Composable
-fun NoteItem(
-    note: Note,
-    modifier: Modifier = Modifier,
-    cornerRadius: Dp = 10.dp,
-    cutCornerSize: Dp = 30.dp,
-    onDeleteClick: () -> Unit
-) {
-    Box(
-        modifier = modifier
-    ) {
-        Canvas(modifier = Modifier.matchParentSize()) {
-            val clipPath = Path().apply {
-                lineTo(size.width - cutCornerSize.toPx(), 0f)
-                lineTo(size.width, cutCornerSize.toPx())
-                lineTo(size.width, size.height)
-                lineTo(0f, size.height)
-                close()
-            }
-
-            clipPath(clipPath) {
-                drawRoundRect(
-                    color = Color(note.color),
-                    size = size,
-                    cornerRadius = CornerRadius(cornerRadius.toPx())
-                )
-                drawRoundRect(
-                    color = Color(
-                        ColorUtils.blendARGB(note.color, 0x000000, 0.2f)
-                    ),
-                    topLeft = Offset(size.width - cutCornerSize.toPx(), -100f),
-                    size = Size(cutCornerSize.toPx() + 100f, cutCornerSize.toPx() + 100f),
-                    cornerRadius = CornerRadius(cornerRadius.toPx())
-                )
-            }
-        }
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp)
-                .padding(end = 32.dp)
-        ) {
-            Text(
-                text = note.title,
-                style = MaterialTheme.typography.headlineSmall,
-                color = MaterialTheme.colorScheme.onSurface,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            Text(
-                text = note.content,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurface,
-                maxLines = 10,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
-        IconButton(
-            onClick = onDeleteClick,
-            modifier = Modifier.align(Alignment.BottomEnd)
-        ) {
-            Icon(
-                imageVector = Icons.Default.Delete,
-                contentDescription = "Delete note",
-                tint = MaterialTheme.colorScheme.onSurface
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt
deleted file mode 100644
index 9a0e1d1e..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/util/Screen.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.util
-
-sealed class Screen(val route: String) {
-    object NotesScreen: Screen("notes_screen")
-    object AddEditNoteScreen: Screen("add_edit_note_screen")
-}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt
similarity index 92%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt
index feb257e8..5d9a7b9a 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/DefaultRadioButton.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
+package com.plcoding.cleanarchitecturenoteapp.ui.component
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt
similarity index 88%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt
index 0fdc3634..f333a018 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/components/OrderSection.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt
@@ -1,11 +1,11 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes.components
+package com.plcoding.cleanarchitecturenoteapp.ui.component
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
 
 @Composable
 fun OrderSection(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt
similarity index 92%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt
index 77f262e1..e6cd0dcd 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/components/TransparentHintTextField.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.components
+package com.plcoding.cleanarchitecturenoteapp.ui.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt
new file mode 100644
index 00000000..4fb44ce8
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt
@@ -0,0 +1,50 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.navigation
+
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.plcoding.cleanarchitecturenoteapp.ui.view.edit.AddEditNoteScreen
+import com.plcoding.cleanarchitecturenoteapp.ui.view.list.NoteListScreen
+
+@ExperimentalAnimationApi
+@Composable
+fun NoteNavigation(modifier: Modifier) {
+    val navController = rememberNavController()
+    NavHost(
+        modifier = modifier,
+        navController = navController,
+        startDestination = NoteScreen.NotesScreen.route
+    ) {
+        composable(route = NoteScreen.NotesScreen.route) {
+            NoteListScreen(navController = navController)
+        }
+        composable(
+            route = NoteScreen.AddEditNoteScreen.route + "?noteId={noteId}&noteColor={noteColor}",
+            arguments = listOf(
+                navArgument(
+                    name = "noteId"
+                ) {
+                    type = NavType.IntType
+                    defaultValue = -1
+                },
+                navArgument(
+                    name = "noteColor"
+                ) {
+                    type = NavType.IntType
+                    defaultValue = -1
+                },
+            )
+        ) {
+            val color = it.arguments?.getInt("noteColor") ?: -1
+            AddEditNoteScreen(
+                navController = navController,
+                noteColor = color
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt
new file mode 100644
index 00000000..04ac30e9
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt
@@ -0,0 +1,6 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.navigation
+
+sealed class NoteScreen(val route: String) {
+    data object NotesScreen: NoteScreen("notes_screen")
+    data object AddEditNoteScreen: NoteScreen("add_edit_note_screen")
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt
index 9b76e750..1ebeddb0 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt
@@ -3,6 +3,7 @@ package com.plcoding.cleanarchitecturenoteapp.ui.theme
 import androidx.compose.ui.graphics.Color
 
 val DarkGray = Color(0xFF202020)
+val LightGray = Color(0xFFD3D3D3)
 val LightBlue = Color(0xFFD7E8DE)
 
 val RedOrange = Color(0xffffab91)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
index 2c6e1c67..42eca8d8 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
@@ -1,11 +1,17 @@
 package com.plcoding.cleanarchitecturenoteapp.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.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 
-private val DarkColorPalette = darkColorScheme(
+private val DarkColorScheme = darkColorScheme(
     primary = Color.White,
     background = DarkGray,
     onBackground = Color.White,
@@ -13,12 +19,34 @@ private val DarkColorPalette = darkColorScheme(
     onSurface = DarkGray
 )
 
+private val LightColorScheme = lightColorScheme(
+    primary = Color.White,
+    background = LightGray,
+    onBackground = Color.White,
+    surface = LightBlue,
+    onSurface = LightGray
+)
+
 @Composable
-fun CleanArchitectureNoteAppTheme(darkTheme: Boolean = true, content: @Composable() () -> Unit) {
+fun CleanArchitectureNoteAppTheme(
+    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 = DarkColorPalette,
+        colorScheme = colorScheme,
         typography = Typography,
-        shapes = Shapes,
         content = content
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt
similarity index 77%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt
index 84c80676..a5347565 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteEvent.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
 
 import androidx.compose.ui.focus.FocusState
 
@@ -8,6 +8,6 @@ sealed class AddEditNoteEvent{
     data class EnteredContent(val value: String): AddEditNoteEvent()
     data class ChangeContentFocus(val focusState: FocusState): AddEditNoteEvent()
     data class ChangeColor(val color: Int): AddEditNoteEvent()
-    object SaveNote: AddEditNoteEvent()
+    data object SaveNote: AddEditNoteEvent()
 }
 
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt
similarity index 89%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt
index a8542ce0..9f295ff8 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteScreen.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
 
 import androidx.compose.animation.Animatable
 import androidx.compose.animation.core.tween
@@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note.components.TransparentHintTextField
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.ui.component.TransparentHintTextField
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
@@ -47,12 +47,13 @@ fun AddEditNoteScreen(
 
     LaunchedEffect(key1 = true) {
         viewModel.eventFlow.collectLatest { event ->
-            when(event) {
+            when (event) {
                 is AddEditNoteViewModel.UiEvent.ShowSnackbar -> {
                     snackbarHostState.showSnackbar(
                         message = event.message
                     )
                 }
+
                 is AddEditNoteViewModel.UiEvent.SaveNote -> {
                     navController.navigateUp()
                 }
@@ -67,6 +68,7 @@ fun AddEditNoteScreen(
                 onClick = {
                     viewModel.onEvent(AddEditNoteEvent.SaveNote)
                 },
+                shape = CircleShape,
                 containerColor = MaterialTheme.colorScheme.primary
             ) {
                 Icon(imageVector = Icons.Default.Save, contentDescription = "Save note")
@@ -78,6 +80,7 @@ fun AddEditNoteScreen(
                 .fillMaxSize()
                 .background(noteBackgroundAnimatable.value)
                 .padding(paddingValues)
+                .padding(16.dp)
         ) {
             Row(
                 modifier = Modifier
@@ -116,29 +119,29 @@ fun AddEditNoteScreen(
             }
             Spacer(modifier = Modifier.height(16.dp))
             TransparentHintTextField(
-                text = titleState.text,
-                hint = titleState.hint,
+                text = titleState.stateText,
+                hint = titleState.stateHint,
                 onValueChange = {
                     viewModel.onEvent(AddEditNoteEvent.EnteredTitle(it))
                 },
                 onFocusChange = {
                     viewModel.onEvent(AddEditNoteEvent.ChangeTitleFocus(it))
                 },
-                isHintVisible = titleState.isHintVisible,
+                isHintVisible = titleState.stateIsHintVisible,
                 singleLine = true,
                 textStyle = MaterialTheme.typography.headlineSmall
             )
             Spacer(modifier = Modifier.height(16.dp))
             TransparentHintTextField(
-                text = contentState.text,
-                hint = contentState.hint,
+                text = contentState.stateText,
+                hint = contentState.stateHint,
                 onValueChange = {
                     viewModel.onEvent(AddEditNoteEvent.EnteredContent(it))
                 },
                 onFocusChange = {
                     viewModel.onEvent(AddEditNoteEvent.ChangeContentFocus(it))
                 },
-                isHintVisible = contentState.isHintVisible,
+                isHintVisible = contentState.stateIsHintVisible,
                 textStyle = MaterialTheme.typography.bodyLarge,
                 modifier = Modifier.fillMaxHeight()
             )
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt
similarity index 62%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt
index 147aecf4..19ddddf5 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/add_edit_note/AddEditNoteViewModel.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt
@@ -1,14 +1,15 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.add_edit_note
+package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
 
 import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.toArgb
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.InvalidNoteException
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.NoteUseCases
+import com.plcoding.cleanarchitecturenoteapp.data.model.InvalidNoteException
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -17,21 +18,17 @@ import javax.inject.Inject
 
 @HiltViewModel
 class AddEditNoteViewModel @Inject constructor(
-    private val noteUseCases: NoteUseCases,
+    private val noteUseCase: NoteUseCase,
     savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
-    private val _noteTitle = mutableStateOf(NoteTextFieldState(
-        hint = "Enter title..."
-    ))
+    private val _noteTitle = mutableStateOf(NoteTextFieldState(stateHint = "Note Title"))
     val noteTitle: State<NoteTextFieldState> = _noteTitle
 
-    private val _noteContent = mutableStateOf(NoteTextFieldState(
-        hint = "Enter some content"
-    ))
+    private val _noteContent = mutableStateOf(NoteTextFieldState(stateHint = "Note Description"))
     val noteContent: State<NoteTextFieldState> = _noteContent
 
-    private val _noteColor = mutableStateOf(Note.noteColors.random().toArgb())
+    private val _noteColor = mutableIntStateOf(Note.noteColors.random().toArgb())
     val noteColor: State<Int> = _noteColor
 
     private val _eventFlow = MutableSharedFlow<UiEvent>()
@@ -41,19 +38,19 @@ class AddEditNoteViewModel @Inject constructor(
 
     init {
         savedStateHandle.get<Int>("noteId")?.let { noteId ->
-            if(noteId != -1) {
+            if (noteId != -1) {
                 viewModelScope.launch {
-                    noteUseCases.getNote(noteId)?.also { note ->
+                    noteUseCase.getNote(noteId)?.also { note ->
                         currentNoteId = note.id
                         _noteTitle.value = noteTitle.value.copy(
-                            text = note.title,
-                            isHintVisible = false
+                            stateText = note.title,
+                            stateIsHintVisible = false
                         )
                         _noteContent.value = _noteContent.value.copy(
-                            text = note.content,
-                            isHintVisible = false
+                            stateText = note.content,
+                            stateIsHintVisible = false
                         )
-                        _noteColor.value = note.color
+                        _noteColor.intValue = note.color
                     }
                 }
             }
@@ -61,46 +58,49 @@ class AddEditNoteViewModel @Inject constructor(
     }
 
     fun onEvent(event: AddEditNoteEvent) {
-        when(event) {
+        when (event) {
             is AddEditNoteEvent.EnteredTitle -> {
                 _noteTitle.value = noteTitle.value.copy(
-                    text = event.value
+                    stateText = event.value
                 )
             }
+
             is AddEditNoteEvent.ChangeTitleFocus -> {
                 _noteTitle.value = noteTitle.value.copy(
-                    isHintVisible = !event.focusState.isFocused &&
-                            noteTitle.value.text.isBlank()
+                    stateIsHintVisible = !event.focusState.isFocused && noteTitle.value.stateText.isBlank()
                 )
             }
+
             is AddEditNoteEvent.EnteredContent -> {
                 _noteContent.value = _noteContent.value.copy(
-                    text = event.value
+                    stateText = event.value
                 )
             }
+
             is AddEditNoteEvent.ChangeContentFocus -> {
                 _noteContent.value = _noteContent.value.copy(
-                    isHintVisible = !event.focusState.isFocused &&
-                            _noteContent.value.text.isBlank()
+                    stateIsHintVisible = !event.focusState.isFocused && _noteContent.value.stateText.isBlank()
                 )
             }
+
             is AddEditNoteEvent.ChangeColor -> {
-                _noteColor.value = event.color
+                _noteColor.intValue = event.color
             }
+
             is AddEditNoteEvent.SaveNote -> {
                 viewModelScope.launch {
                     try {
-                        noteUseCases.addNote(
+                        noteUseCase.addNote(
                             Note(
-                                title = noteTitle.value.text,
-                                content = noteContent.value.text,
+                                title = noteTitle.value.stateText,
+                                content = noteContent.value.stateText,
                                 timestamp = System.currentTimeMillis(),
                                 color = noteColor.value,
                                 id = currentNoteId
                             )
                         )
                         _eventFlow.emit(UiEvent.SaveNote)
-                    } catch(e: InvalidNoteException) {
+                    } catch (e: InvalidNoteException) {
                         _eventFlow.emit(
                             UiEvent.ShowSnackbar(
                                 message = e.message ?: "Couldn't save note"
@@ -113,7 +113,7 @@ class AddEditNoteViewModel @Inject constructor(
     }
 
     sealed class UiEvent {
-        data class ShowSnackbar(val message: String): UiEvent()
-        object SaveNote: UiEvent()
+        data class ShowSnackbar(val message: String) : UiEvent()
+        data object SaveNote : UiEvent()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt
new file mode 100644
index 00000000..e52cb3fa
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt
@@ -0,0 +1,7 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
+
+data class NoteTextFieldState(
+    val stateText: String = "",
+    val stateHint: String = "",
+    val stateIsHintVisible: Boolean = true
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt
new file mode 100644
index 00000000..4d55531d
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt
@@ -0,0 +1,11 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+
+sealed class NoteListEvent {
+    data class Order(val noteOrder: NoteOrder): NoteListEvent()
+    data class DeleteNote(val note: Note): NoteListEvent()
+    data object RestoreNote: NoteListEvent()
+    data object ToggleOrderSection: NoteListEvent()
+}
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
new file mode 100644
index 00000000..753da639
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
@@ -0,0 +1,209 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+
+import androidx.compose.animation.*
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Sort
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavController
+import com.plcoding.cleanarchitecturenoteapp.ui.component.OrderSection
+import com.plcoding.cleanarchitecturenoteapp.ui.navigation.NoteScreen
+import kotlinx.coroutines.launch
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.automirrored.filled.Sort
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.clipPath
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.core.graphics.ColorUtils
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+
+@ExperimentalAnimationApi
+@Composable
+fun NoteListScreen(
+    navController: NavController,
+    viewModel: NoteListViewModel = hiltViewModel()
+) {
+    val state = viewModel.state.value
+    val snackbarHostState = remember { SnackbarHostState() }
+    val scope = rememberCoroutineScope()
+
+    Scaffold(
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    navController.navigate(NoteScreen.AddEditNoteScreen.route)
+                },
+                shape = CircleShape,
+                containerColor = MaterialTheme.colorScheme.primary
+            ) {
+                Icon(imageVector = Icons.Default.Add, contentDescription = "Add note")
+            }
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+                .padding(16.dp)
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = "JetNote",
+                    style = MaterialTheme.typography.headlineMedium
+                )
+                IconButton(
+                    onClick = {
+                        viewModel.onEvent(NoteListEvent.ToggleOrderSection)
+                    },
+                ) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Default.Sort,
+                        contentDescription = "Sort"
+                    )
+                }
+            }
+            AnimatedVisibility(
+                visible = state.isOrderSectionVisible,
+                enter = fadeIn() + slideInVertically(),
+                exit = fadeOut() + slideOutVertically()
+            ) {
+                OrderSection(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 16.dp),
+                    noteOrder = state.noteOrder,
+                    onOrderChange = {
+                        viewModel.onEvent(NoteListEvent.Order(it))
+                    }
+                )
+            }
+            Spacer(modifier = Modifier.height(16.dp))
+            LazyColumn(modifier = Modifier.fillMaxSize()) {
+                items(state.notes) { note ->
+                    NoteItem(
+                        note = note,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable {
+                                navController.navigate(
+                                    NoteScreen.AddEditNoteScreen.route +
+                                            "?noteId=${note.id}&noteColor=${note.color}"
+                                )
+                            },
+                        onDeleteClick = {
+                            viewModel.onEvent(NoteListEvent.DeleteNote(note))
+                            scope.launch {
+                                val result = snackbarHostState.showSnackbar(
+                                    message = "Note deleted",
+                                    actionLabel = "Undo"
+                                )
+                                if(result == SnackbarResult.ActionPerformed) {
+                                    viewModel.onEvent(NoteListEvent.RestoreNote)
+                                }
+                            }
+                        }
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun NoteItem(
+    note: Note,
+    modifier: Modifier = Modifier,
+    cornerRadius: Dp = 10.dp,
+    cutCornerSize: Dp = 30.dp,
+    onDeleteClick: () -> Unit
+) {
+    Box(
+        modifier = modifier
+    ) {
+        Canvas(modifier = Modifier.matchParentSize()) {
+            val clipPath = Path().apply {
+                lineTo(size.width - cutCornerSize.toPx(), 0f)
+                lineTo(size.width, cutCornerSize.toPx())
+                lineTo(size.width, size.height)
+                lineTo(0f, size.height)
+                close()
+            }
+
+            clipPath(clipPath) {
+                drawRoundRect(
+                    color = Color(note.color),
+                    size = size,
+                    cornerRadius = CornerRadius(cornerRadius.toPx())
+                )
+                drawRoundRect(
+                    color = Color(
+                        ColorUtils.blendARGB(note.color, 0x000000, 0.2f)
+                    ),
+                    topLeft = Offset(size.width - cutCornerSize.toPx(), -100f),
+                    size = Size(cutCornerSize.toPx() + 100f, cutCornerSize.toPx() + 100f),
+                    cornerRadius = CornerRadius(cornerRadius.toPx())
+                )
+            }
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp)
+                .padding(end = 32.dp)
+        ) {
+            Text(
+                text = note.title,
+                style = MaterialTheme.typography.headlineSmall,
+                color = MaterialTheme.colorScheme.onSurface,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            Text(
+                text = note.content,
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurface,
+                maxLines = 10,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+        IconButton(
+            onClick = onDeleteClick,
+            modifier = Modifier.align(Alignment.BottomEnd)
+        ) {
+            Icon(
+                imageVector = Icons.Default.Delete,
+                contentDescription = "Delete note",
+                tint = MaterialTheme.colorScheme.onSurface
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
new file mode 100644
index 00000000..acad126f
--- /dev/null
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
@@ -0,0 +1,11 @@
+package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
+
+data class NoteListState(
+    val notes: List<Note> = emptyList(),
+    val noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
+    val isOrderSectionVisible: Boolean = false
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt
similarity index 62%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt
rename to app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt
index bd11c8d6..31bf4faa 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/feature_note/presentation/notes/NotesViewModel.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt
@@ -1,13 +1,13 @@
-package com.plcoding.cleanarchitecturenoteapp.feature_note.presentation.notes
+package com.plcoding.cleanarchitecturenoteapp.ui.view.list
 
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.model.Note
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.use_case.NoteUseCases
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.feature_note.domain.util.OrderType
+import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
+import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
@@ -16,12 +16,12 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class NotesViewModel @Inject constructor(
-    private val noteUseCases: NoteUseCases
+class NoteListViewModel @Inject constructor(
+    private val noteUseCase: NoteUseCase
 ) : ViewModel() {
 
-    private val _state = mutableStateOf(NotesState())
-    val state: State<NotesState> = _state
+    private val _state = mutableStateOf(NoteListState())
+    val state: State<NoteListState> = _state
 
     private var recentlyDeletedNote: Note? = null
 
@@ -31,9 +31,9 @@ class NotesViewModel @Inject constructor(
         getNotes(NoteOrder.Date(OrderType.Descending))
     }
 
-    fun onEvent(event: NotesEvent) {
+    fun onEvent(event: NoteListEvent) {
         when (event) {
-            is NotesEvent.Order -> {
+            is NoteListEvent.Order -> {
                 if (state.value.noteOrder::class == event.noteOrder::class &&
                     state.value.noteOrder.orderType == event.noteOrder.orderType
                 ) {
@@ -41,19 +41,22 @@ class NotesViewModel @Inject constructor(
                 }
                 getNotes(event.noteOrder)
             }
-            is NotesEvent.DeleteNote -> {
+
+            is NoteListEvent.DeleteNote -> {
                 viewModelScope.launch {
-                    noteUseCases.deleteNote(event.note)
+                    noteUseCase.deleteNote(event.note)
                     recentlyDeletedNote = event.note
                 }
             }
-            is NotesEvent.RestoreNote -> {
+
+            is NoteListEvent.RestoreNote -> {
                 viewModelScope.launch {
-                    noteUseCases.addNote(recentlyDeletedNote ?: return@launch)
+                    noteUseCase.addNote(recentlyDeletedNote ?: return@launch)
                     recentlyDeletedNote = null
                 }
             }
-            is NotesEvent.ToggleOrderSection -> {
+
+            is NoteListEvent.ToggleOrderSection -> {
                 _state.value = state.value.copy(
                     isOrderSectionVisible = !state.value.isOrderSectionVisible
                 )
@@ -63,7 +66,7 @@ class NotesViewModel @Inject constructor(
 
     private fun getNotes(noteOrder: NoteOrder) {
         getNotesJob?.cancel()
-        getNotesJob = noteUseCases.getNotes(noteOrder)
+        getNotesJob = noteUseCase.getNotes(noteOrder)
             .onEach { notes ->
                 _state.value = state.value.copy(
                     notes = notes,

From 64cb5faa64e400d1d749b111289ea5c56325b821 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Wed, 13 Nov 2024 01:24:22 +0300
Subject: [PATCH 04/14] Splash screen added.

---
 app/build.gradle.kts                             |  14 ++++++++------
 app/src/main/AndroidManifest.xml                 |   4 ++--
 app/src/main/icon_launcher-playstore.png         | Bin 0 -> 8525 bytes
 .../cleanarchitecturenoteapp/MainActivity.kt     |   5 ++---
 .../cleanarchitecturenoteapp/ui/theme/Theme.kt   |   2 +-
 .../ui/view/list/NoteListScreen.kt               |   5 +++--
 .../res/drawable/icon_launcher_foreground.xml    |  15 +++++++++++++++
 .../main/res/mipmap-anydpi-v26/icon_launcher.xml |   5 +++++
 .../mipmap-anydpi-v26/icon_launcher_round.xml    |   5 +++++
 app/src/main/res/mipmap-hdpi/icon_launcher.webp  | Bin 0 -> 686 bytes
 .../res/mipmap-hdpi/icon_launcher_round.webp     | Bin 0 -> 1824 bytes
 app/src/main/res/mipmap-mdpi/icon_launcher.webp  | Bin 0 -> 492 bytes
 .../res/mipmap-mdpi/icon_launcher_round.webp     | Bin 0 -> 1180 bytes
 app/src/main/res/mipmap-xhdpi/icon_launcher.webp | Bin 0 -> 872 bytes
 .../res/mipmap-xhdpi/icon_launcher_round.webp    | Bin 0 -> 2658 bytes
 .../main/res/mipmap-xxhdpi/icon_launcher.webp    | Bin 0 -> 1278 bytes
 .../res/mipmap-xxhdpi/icon_launcher_round.webp   | Bin 0 -> 4110 bytes
 .../main/res/mipmap-xxxhdpi/icon_launcher.webp   | Bin 0 -> 1690 bytes
 .../res/mipmap-xxxhdpi/icon_launcher_round.webp  | Bin 0 -> 5934 bytes
 .../main/res/values/icon_launcher_background.xml |   4 ++++
 20 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/icon_launcher-playstore.png
 create mode 100644 app/src/main/res/drawable/icon_launcher_foreground.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/icon_launcher.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/icon_launcher_round.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/icon_launcher.webp
 create mode 100644 app/src/main/res/mipmap-hdpi/icon_launcher_round.webp
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_launcher.webp
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_launcher_round.webp
 create mode 100644 app/src/main/res/mipmap-xhdpi/icon_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xhdpi/icon_launcher_round.webp
 create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_launcher_round.webp
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_launcher_round.webp
 create mode 100644 app/src/main/res/values/icon_launcher_background.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c121e9f1..aa561e4b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,14 +60,14 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
 
     // Compose dependencies
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-beta01")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
     implementation("androidx.navigation:navigation-compose:2.8.3")
     implementation("androidx.compose.material:material-icons-extended:1.7.5")
-    implementation("androidx.hilt:hilt-navigation-compose:1.0.0-alpha03")
+    implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
 
     // Coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
 
     //Dagger - Hilt
     implementation("com.google.dagger:hilt-android:2.49")
@@ -77,9 +77,11 @@ dependencies {
     // Room
     implementation("androidx.room:room-runtime:2.6.1")
     kapt("androidx.room:room-compiler:2.6.1")
-
-    // Kotlin Extensions and Coroutines support for Room
     implementation("androidx.room:room-ktx:2.6.1")
+
+    // Splash Screen
+    implementation("androidx.core:core-splashscreen:1.0.0")
+
 }
 
 kapt {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34168768..5c79f1fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,9 +5,9 @@
     <application
         android:name=".NoteApp"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/icon_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.CleanArchitectureNoteApp">
         <activity
diff --git a/app/src/main/icon_launcher-playstore.png b/app/src/main/icon_launcher-playstore.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d624235e0d29d68bb9fc67ab9a5d01a55fcb60
GIT binary patch
literal 8525
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
A;s5{u

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
index a53ba7e4..6656dbf2 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
@@ -4,13 +4,11 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.plcoding.cleanarchitecturenoteapp.ui.navigation.NoteNavigation
 import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -19,6 +17,7 @@ import dagger.hilt.android.AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     @ExperimentalAnimationApi
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
         super.onCreate(savedInstanceState)
         setContent {
             CleanArchitectureNoteAppTheme {
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
index 42eca8d8..7446ed5d 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
@@ -24,7 +24,7 @@ private val LightColorScheme = lightColorScheme(
     background = LightGray,
     onBackground = Color.White,
     surface = LightBlue,
-    onSurface = LightGray
+    onSurface = DarkGray
 )
 
 @Composable
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
index 753da639..4897ab42 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.core.graphics.ColorUtils
 import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.plcoding.cleanarchitecturenoteapp.ui.theme.DarkGray
 
 @ExperimentalAnimationApi
 @Composable
@@ -182,7 +183,7 @@ fun NoteItem(
             Text(
                 text = note.title,
                 style = MaterialTheme.typography.headlineSmall,
-                color = MaterialTheme.colorScheme.onSurface,
+                color = DarkGray,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
@@ -190,7 +191,7 @@ fun NoteItem(
             Text(
                 text = note.content,
                 style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurface,
+                color = DarkGray,
                 maxLines = 10,
                 overflow = TextOverflow.Ellipsis
             )
diff --git a/app/src/main/res/drawable/icon_launcher_foreground.xml b/app/src/main/res/drawable/icon_launcher_foreground.xml
new file mode 100644
index 00000000..83c3cba7
--- /dev/null
+++ b/app/src/main/res/drawable/icon_launcher_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#000000">
+  <group android:scaleX="0.6496"
+      android:scaleY="0.6496"
+      android:translateX="4.2048"
+      android:translateY="4.2048">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,10h11v2H3V10zM3,8h11V6H3V8zM3,16h7v-2H3V16zM18.01,12.87l0.71,-0.71c0.39,-0.39 1.02,-0.39 1.41,0l0.71,0.71c0.39,0.39 0.39,1.02 0,1.41l-0.71,0.71L18.01,12.87zM17.3,13.58l-5.3,5.3V21h2.12l5.3,-5.3L17.3,13.58z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/icon_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/icon_launcher.xml
new file mode 100644
index 00000000..519a0847
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/icon_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_launcher_background"/>
+    <foreground android:drawable="@drawable/icon_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/icon_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/icon_launcher_round.xml
new file mode 100644
index 00000000..519a0847
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/icon_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_launcher_background"/>
+    <foreground android:drawable="@drawable/icon_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/icon_launcher.webp b/app/src/main/res/mipmap-hdpi/icon_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0ce139e8b5273bb3d371c53a8611b6c7ae7b3ea8
GIT binary patch
literal 686
zcmV;f0#W@^Nk&Gd0ssJ4MM6+kP&iDQ0ssInN5Byfbx8LA$*`TevCStqS=qb0jgyD4
zcgZTB`v9?R+qP}n$+a<krl*5Bqq<tw^xRVu0mas~HBSCNNtu~!74Lv#Pi1v|w=lMf
zK{11x=^AJOxShbA0IGjiL1idI4^$+iv8$L!ZKz#!tPa&tpjn3m3B@jAQX}f!5=p_2
ztoM=;iXEvyWPMo70%cV41(8&6qB5%5w3vlPX%!WoZ$Y9mM-a;Pu*gDqbq2v1#G-Qv
zNtpENE^-E0?gbWE@YDO)MeZe@rw?wjukbv1tmiWo$l-aBfaMu4!Se|MmaRYF`Ea$o
zBD0O=d6s|$zwT9Nw$VJ#60mIj0ndl46Mb}472kqsSOn-^o~Z_^%-0mqI^hX?!aR)t
zt@U8vATzw9E6nj<hO7Lkbk%Wge{o}2AR*Q?7tp$!XZ*?5A8>nw3&UcqfSyj1l4fYE
zwe=X2uv~LM>n_fb^b~6tBt*PMBjEqePLopO5Y_-G+bQB-rStZ4`<(;Ba*d>DZX1(-
zei{~Q4%oN02}_6!3$+65+uA^o5LH>MHDKS)dV++=uvja=zOD5P5+Y%VmVkY08we7n
z<(dNa&21t`s6fg_wqdDSXkt5)R4uf$nMtY^+E`DJ(Dgw?1FR=#e7~gA>1=`yM)svY
ze##>0$%C8RD=Z;Ddvx>r)Ph77!tE<JH@78Om@tr4l-RKY+5Oy!3XsC&r|+Z&Ss-lS
z2Y)aVs^En7rZ6yi<>_A`LsH;{BKQ7>ufsrA28r{`4w!=F#f_7%m)|ZlFSUs1VvC5G
zh>3}qiI|9piI|C)n24E(i7z$dldp>#Q8=s<5|<DLbioA7!W_&8KCNNAcQ*t#L<927
UfdM1E#{wUP19I{-jgab70gxR`$N&HU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/icon_launcher_round.webp b/app/src/main/res/mipmap-hdpi/icon_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5ad44c91c2bd821a961fbbed5878a327fd8baac5
GIT binary patch
literal 1824
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
Oso%iRR`T0bL}C&!B9kKk

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_launcher.webp b/app/src/main/res/mipmap-mdpi/icon_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..27c0b414b345ee9643b89b6cb13a5b80b87e254b
GIT binary patch
literal 492
zcmV<I0TcdGNk&HG0RRA3MM6+kP&iE20RR9mFTe{BRY=yh&CsJSIsqPvZSQQYva{_~
zPQp%RW@+2T&Sso+SJ$Ba(r8<VfE)+_!6vqC8&jm;tXFPeOl3WNj@&kKBx-6-vpLis
z)ZY>g<A`vE4u`DbjQhD+rEnSda91#+mBJy);1oXe9?+|B1|8y*?_rgD>_KGo^$da}
z99A0@_X%;o(4YG!n03EA8_#E(5FqXhN7Tcq^NzTGS~%m`_&BtJ0FIE(&73z$=GGLl
zPE(uzjZ1Pdn;_~iz^uTZ=AEOM-S)TN?5YCHCjIR<dt?B!MWi=+4EjLoC0|4UI?-Da
z?K;pX0Pxd}%S($WJwx$AzT>vE2;yf1mm>hBMZTWN0)m~ip-F>pWO*hV&^p{Pn|2{w
z&Pzt=B<g70#Ubl^_*^Dp%4|a<c`XI_$xi_XBFP8w$S;=zk>tH7#FTO%vWy_6$~Hur
z0l#ihV*?_UpITob3}XNDcP-F|eZ~Dhe{mt}e_&=y!eO=AIe78N*i+c&*NKrj6(RQ^
zB%Yohz&u7UZT4NihNSP_gmCQo+TDk@FQ1=3zI=-G^GSVtyL2DDg)n6?8yKeV>i3m<
i!A#l#3?WHf{Dm<{LryqV7_$(db}Di`Dx6h+NeTc@r0n_t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_launcher_round.webp b/app/src/main/res/mipmap-mdpi/icon_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3680e68b10fedef3999ad6eae35fbbc19fc18d39
GIT binary patch
literal 1180
zcmV;N1Y`SBNk&GL1ONb6MM6+kP&iD81ONapFTe{BmC&}f&5S7hW81c^GuyV#bO*Ec
z;n=oq+qP}nGi|1-{xzLSrP5dMclzH+N1X^c+qM~!)zw_vHY4*Ovu)eTZ2kb-C$_D1
zK8la+(^d62aNEX_q%}6%d+y#qzM?=2os>MLVTytRiYD6RigB2Y#rc%UH9|9Rg%vm-
zkE$m!B;TnoDP<)d#rcz91v*5Gv(;VoLm@Gl79)%$3SDdtLLn}bftXopp$tx#d5p_K
zib4xgB5YBeF-s-<oK5PdAvy^RN^OGcl$7K`vV}#?O3HOasej~Qg+%xhwsI0O_mBDw
zXcEawu~b5_wMovs%OH#c3L<eNPI5^A^Mo76G77y!B-h4ypfKl3IaD@)5gDF$zgbC1
z!U0X<p8U0)LhnjWr$qQ1*pRE;VA52d*I%m0Yx+12!NT+LIgV0&eqE)_ni9r10T%Kv
zmIko!K>VJ+q8fZG!5u}^oUM?GhXAuuJ-%Bwn1h0-dzXdJ6%J-cEIbMS#eY5k(|x=D
zDi=REXF-iB7B=xc0@C>LN-d@6P<5d~Y95kG_xNlDg(=lfuu#Jy5qy6ZL`qrfxl5I!
zIS>oa#UK9t71%`2$8|yjhO-$bioYYLClh^;+kZPuYVWQuB6_FP`8)(VR2b>hzuZ#=
z2EADB643it5@1(;MdyZEqK6B*?*j8XYXb0W>_r2Y>idgI!Jrw*?NCq}@MSCnz;kme
zE`LUj${+%-^1`LVgWQS9A2Bg{j4gSAKDV(rz#=@4gcJU$6Jo$X8|>fDSgdj<1{_{x
z1%MU#m^Rn4EEl7_Cm&w~Cqf6rN2?@KPxx<ad4`n$nAhMXB;Vk`EVa^Ip4tdv@E+b+
z*Z;;+@!zb*{FuBKZ~Y7_0Jv^O6>VQg<@=efU_5W5Ac*_x5euKk&+!B%f5WrItE`BY
zxwsJRv4{NSQ%EEfg9R_G77Qk>e3a$UGAp;BMQGF=?%xP@<o1Cr@+(0W(uO|IvMgE_
z<YEM#KJZg$<07rmL=g4dCI_W$MlZ1<dVMj4-e*vExPLoDMS35D?B9BA`q)D(jlRXr
z=rxD@Wk2N6U6$Tf!8?Ck^Pj?h)>3F$fD6!Tb|muOzY`~i?>OE*3`vje?Sfh;KlG(n
z;Hi_c#k~g$v<-d!APaI{ztjVjP!`O~we<01+~xVJkVB>)w<$PK{Pwjjh$GD`Nl`3=
zY3ca28&CqyU6%QG3Op!%`EnaX_(Gfbktq5Ted)|FYw_GwC<E_#o6MFW6y1BU@|RJY
z3-(kc|MT~bL#c0wrt7(oGh_Pay=@f#7eX0dfk_gUaq(I2@iWKkxu&Ito!#X^GF0Eb
z>-%5}NtQ_^l*c^FxJ7#FZm5~u<%VEb`Hlk~WGzv5?WPZ({{6L$gG7N0jJfFW&)1Kh
zmI-8epSR7-7@{E)Di0lb<JOn1e%AR@=+8I*eH=wUhd%Fo>FSMJ3#cm7_yjZ9KNoNy
up@br+UZ!EY!TS!0!zrib%q&8a0*c~!`&0KWH-l)1h4^HYW`s`Ze-Hwq{zM1>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/icon_launcher.webp b/app/src/main/res/mipmap-xhdpi/icon_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e1f712a8064c3cd98f8e23463443ee77e5bd58bd
GIT binary patch
literal 872
zcmV-u1DE_#Nk&Fs0{{S5MM6+kP&iCe0{{RoU%(d-bx6Xt?Tnqbwr$(o*>+d9jU89o
zn!9#o+qP|;b85SjFMlyj{z<-C|NJw_M98tN?bx%Iv2ELSnUx6`qsdB{K6R>OG`6bz
zwv9aj>KAJfiI~AyC_GQG=y}paqLfHQooErwE|01(0u_<uDN!W0#G!aCK8cUo)t(Of
zVoMY$5le|E(IajI6X7so-n{5jB9S0s^{m9aHPJ8Q5B+5@>_=YQ?J7s$$p~x<#&7yh
zSd7x|x329-5RqD!NyjGRFJaQx3Fiay5QxZ*r!F+pTVnj<A}ZW_x3EWv*cQUQee{Ks
z2VduoBeaKTb3ZHhzs#CIWDoJ`L00a6ojQg1_qO>a3i%Y5xvU}xc}na2<QbxckhgW1
z%Uu5xWS6x<zTRCft1g9*r?-L2DuR%ww9e0l1amF$l%t%#MLMAKIEk^9(gCe?K1Z;1
zSy~V@pOd(Hsjno0=n_~myrlJWy(ASRx!WA`#%ogFk`u5(V;2zpR4++=mcnC>8K5z#
zW4tB9UoAVR<PxGE>me!7iF8C9QxQmQ<TVKa8)N}mmlB8QCpt?avAPoQvsxzbc`3IL
z{ZtpV+@aZ7D<cSA))hp*^@?U^opj*K6<kCtbFo%BV09RSv$k1D>OKM1{FO2StF6Q#
z&T`^=>tzB~TZ==u30NsJu-Z%l!i{06Y`|h7^*lhh@mI(WEGE{(J%k&>dYOU6M4GsR
zu(MhQV6}mJ2s_KA1y-ATh_JIpI$*Vp1caY7z-k+D2t#1CwFHE>HWCol5^3%(!dhYt
zJw#Ybtg#0OS2YFg=`O;SBfkgkf043wh?V<ar%%gR)MLEkB>w%RQF|f^*C>B;VKV-5
z;YTjqR;UdxitVU5DGJZ+2AIE%|2zc#`_HZ0Q*%-T_K??Z?AGIZ=5P9A{0sbZebo5l
zd&i&FpF;kG40{MW<e_%->ba*+5rIL|Ge@5d-i)=(M`%wWDPD%Q+Vjiyk3Zb_822si
ztLN&Nck`3K_@L$j+KQGVK_C$!GE3A%F_3$<-D0=3E~_qAUhX*zM0FUU421|;g(`D2
yqaEGoalJ-+IEJhU0=XVi<mM?YSXH1pUyaLS5l<mSh(NlB7zt9>$HEBJucZL*;irQD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/icon_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/icon_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d472fe8e44bf9c54160a08ca692af0d60ea28bab
GIT binary patch
literal 2658
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
Q=b+^(s&YBbV{$PH0R6Br_W%F@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/icon_launcher.webp b/app/src/main/res/mipmap-xxhdpi/icon_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6f9e233f0f5ce82d3b7a0caeb659169889e79a98
GIT binary patch
literal 1278
zcmV<a1OfX}Nk&HY1ONb6MM6+kP&iEL1ONapkH8}kwNS$Te@*0kfvvl{%Nl#CyUWSl
z-TmaUa;&?%_wMfQ-mbg514(KO`G@>cTlo+3kjak;VTB|G8X6(Twzgw?-VeWR+qTUi
z#I90VBXFu@E?Fu6J}hmg|NXw-w<kc(rB;h+aV=r`QPDs}Eg4A?Be!S}S4yd6YYke9
z)@<^%Mu(KrHH0r+?VR>h`>btihuVS3%SDR|B^QBj0AFfL+FMN!s3;7AVtQHn!hD%I
z83bymgi1<D6Id&i0>#8L2z)`VYy^RN$Yd&q!3+a7r7J{>$xkxWcbXa#x|oN5yf{Y|
zMYxE~yb!1%ld6RieRe7IL_|nro&`!s%fi{d+d}f0gn(jre}VEfP*SwiRDFM*ToD%a
z)8h6A9qNusNz<}07_xiIkloPl^<?v%J~gB!lMaT3w@o$g&Jci%X9v_ndWMGA&LBg;
zzsP!Kn4;cu#h#fWo*bd5=e(stHciny1&s5kM;QM(=JuJTBp823=Ju%sF#dMtERiuo
z9?oQL=0E3ypX_Z<#y^+2wI_h_w=>6pS?YDq1cvMB8pgkePANC&EGA)RFUddi^v@6n
zj^ixpJ{cAv<s@<NyWvApEP;25ILNxJyQNrxCqYYBbhk7MFv-c{THvha6Bd9cIbK2w
zoYN6E!!*pyQye3q1^c3Hri&eKI%ej{PT*(TUtUf2y4Q%FNL1q-;2bT5nYrU++3t~7
zpGpAHZxiHIV;sjhn8(aK*(rW+8>0~BpDE6994F>r9y9Y~jo)<B57U)a{?GaSBe~4X
z6Pyj4&IVz+ytDXD_Tx;(%sj!F3WG6S?!}xIpI`!JX4huA+>1Fmo@fHrl@RwLF}XM=
znuIjB8RO(0n!@LnwG`3s(#g9B=-AnhOd(&>T0zGx*-Tf;>Ed)q8i?ug&X54PC-ud2
zrBve}_s)i3y6R_(f!xbgrfaGTfR0IhF<t*(1avI?gz0iG5Tiq(Kc;K(`C=gVq$bnl
zod<L*_r-LjoC<U-SD7yVWN|tqRhh0?PUl1JN&PTkw}^q<w=@t_b`8kAvq9Ke^w4B$
z(cKT&T6ERH)}qiCTZ={qTZ^*I)}mmu73e7;dk_7wB^d5g*@t0kkgtC|JvFL^1od7J
z(K8v{Kcw!^Ghp|U+31W6{SHq=2h`5~QBhK~)GA;6*`Yn!J*gk!JLI5j(v~U{(V|8(
zz4097ix3xZd>+c)zn!K;q-3a3_5OSE@O%M?ZJvda^*e@sYbYTh1vT{E{Jl;ON;b|8
z1t4Rqax~m}aj-(EKt(|fHJ`cqDjGawh(Hqg>(!(4{yRUIL5;YUNfTIOp5;?FK5AXJ
z0r^b<vJ#<e%{KJ)x%$rU0j5!DD4c1aSN>daEA&tnA&x*GV#sKqdbMs0tT}Vb<LBPI
z_y3!{zR{1N$^R66xA*@4XW!iTWX;+3)w)sLKn7wWWCd9$M%_9+=wD)ZiP6ng4?S}1
ziNjBr{81+kIl9s65@QwguhSFNi-=31Ari>0qjstGwfdJE#NZOc1U4ORwd)ZQp%@w3
z5eiX(dbBLnwS3Pi{ia`As<XpKMJcjFDLS-~iQE#(P>E{Pc&IgX&kNfnirg|1h#?Rk
ohBh*a$Z?U^)-d(9Hn&;~>@bvu3`4{#Hi4B&7)k?&1j;#;0$YN8DF6Tf

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/icon_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/icon_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b9c1919a7c85e3160af8c33d724e0799e14285dd
GIT binary patch
literal 4110
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
M#bl+T%4Y4ZWnp>-?f?J)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/icon_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7b3c94cd12b37cde5657487ff4ebef02b8d5d7e0
GIT binary patch
literal 1690
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/icon_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c8de0428c7dc4db9be2b78ca101c532dd722eb28
GIT binary patch
literal 5934
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
Q9mfqb6D}sW^RTQ*0E@SV?f?J)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/icon_launcher_background.xml b/app/src/main/res/values/icon_launcher_background.xml
new file mode 100644
index 00000000..dc8c7221
--- /dev/null
+++ b/app/src/main/res/values/icon_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="icon_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file

From da0078c8e618716d84bc6e096f8f2245c17b78bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0brahim=20Can=20Erdo=C4=9Fan?=
 <52867508+icanerdogan@users.noreply.github.com>
Date: Wed, 13 Nov 2024 01:29:10 +0300
Subject: [PATCH 05/14] Create README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..da0c3d85
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# JetCleanNote
+
+App - Light             |  App-Dark          |  Add Note Screen
+:-------------------------:|:-------------------------:|:-------------------------:
+![](https://github.com/user-attachments/assets/f100b17d-3f61-4bb0-929f-e3f79ee46f89)  |  ![](https://github.com/user-attachments/assets/a3d0c267-af5d-4a08-9564-b8202dd3045c)  | ![](https://github.com/user-attachments/assets/d6e5bb4c-965b-4c76-a747-65d2a6a1cb1a)

From 1e8976037b90300c8c2c73b2d6ce3792dfbfd0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0brahim=20Can=20Erdo=C4=9Fan?=
 <52867508+icanerdogan@users.noreply.github.com>
Date: Wed, 13 Nov 2024 01:33:44 +0300
Subject: [PATCH 06/14] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index da0c3d85..5fee77e4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# JetCleanNote
+
+# JetCleanNote
 
 App - Light             |  App-Dark          |  Add Note Screen
 :-------------------------:|:-------------------------:|:-------------------------:

From fe74e772382f7aa2459da74f14442faba8fcb849 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Wed, 13 Nov 2024 01:46:49 +0300
Subject: [PATCH 07/14] Status & navigation color changed.

---
 .../cleanarchitecturenoteapp/ui/theme/Theme.kt     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
index 7446ed5d..546805c4 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
@@ -1,5 +1,6 @@
 package com.plcoding.cleanarchitecturenoteapp.ui.theme
 
+import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -8,8 +9,12 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.ViewCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Color.White,
@@ -44,6 +49,15 @@ fun CleanArchitectureNoteAppTheme(
         else -> LightColorScheme
     }
 
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            (view.context as Activity).window.statusBarColor = colorScheme.background.toArgb()
+            (view.context as Activity).window.navigationBarColor = colorScheme.background.toArgb()
+            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
+        }
+    }
+
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,

From 31305bc4cb13ffa1e0f45efc73375dbd8c70117e Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Thu, 12 Dec 2024 21:18:57 +0300
Subject: [PATCH 08/14] Project optimization.

---
 .../plcoding/cleanarchitecturenoteapp/MainActivity.kt    | 2 ++
 .../plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt  | 9 ---------
 .../ui/view/list/NoteListScreen.kt                       | 5 ++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
index 6656dbf2..2a902041 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
@@ -3,6 +3,7 @@ package com.plcoding.cleanarchitecturenoteapp
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -19,6 +20,7 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             CleanArchitectureNoteAppTheme {
                 Scaffold (
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
index 546805c4..e840757f 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
@@ -49,15 +49,6 @@ fun CleanArchitectureNoteAppTheme(
         else -> LightColorScheme
     }
 
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.background.toArgb()
-            (view.context as Activity).window.navigationBarColor = colorScheme.background.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
-        }
-    }
-
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
index 4897ab42..262eef00 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
+++ b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
@@ -92,8 +92,7 @@ fun NoteListScreen(
             }
             AnimatedVisibility(
                 visible = state.isOrderSectionVisible,
-                enter = fadeIn() + slideInVertically(),
-                exit = fadeOut() + slideOutVertically()
+                enter = fadeIn() + slideInVertically()
             ) {
                 OrderSection(
                     modifier = Modifier
@@ -105,7 +104,7 @@ fun NoteListScreen(
                     }
                 )
             }
-            Spacer(modifier = Modifier.height(16.dp))
+            Spacer(modifier = Modifier.height(5.dp))
             LazyColumn(modifier = Modifier.fillMaxSize()) {
                 items(state.notes) { note ->
                     NoteItem(

From 85515357ba6e0e5c83fd63f7e756c344ed146e6d Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Fri, 13 Dec 2024 00:31:06 +0300
Subject: [PATCH 09/14] Package names renamed.

---
 .../cleannote}/ExampleInstrumentedTest.kt          |  2 +-
 app/src/main/AndroidManifest.xml                   |  6 +++---
 .../cleannote}/MainActivity.kt                     |  6 +++---
 .../cleannote}/NoteApp.kt                          |  2 +-
 .../cleannote}/data/database/NoteDao.kt            |  4 ++--
 .../cleannote}/data/database/NoteDatabase.kt       |  4 ++--
 .../cleannote}/data/model/Note.kt                  |  4 ++--
 .../data/repository/NoteRepositoryImpl.kt          |  8 ++++----
 .../cleannote}/di/DatabaseModule.kt                |  5 ++---
 .../cleannote}/di/RepositoryModule.kt              |  8 ++++----
 .../cleannote}/di/UseCaseModule.kt                 | 14 +++++++-------
 .../cleannote}/domain/repository/NoteRepository.kt |  4 ++--
 .../cleannote}/domain/usecase/AddNote.kt           |  8 ++++----
 .../cleannote}/domain/usecase/DeleteNote.kt        |  6 +++---
 .../cleannote}/domain/usecase/GetNote.kt           |  6 +++---
 .../cleannote}/domain/usecase/GetNotes.kt          | 10 +++++-----
 .../cleannote}/domain/usecase/NoteUseCase.kt       |  2 +-
 .../cleannote}/domain/util/NoteOrder.kt            |  2 +-
 .../cleannote}/domain/util/OrderType.kt            |  2 +-
 .../cleannote}/ui/component/DefaultRadioButton.kt  |  2 +-
 .../cleannote}/ui/component/OrderSection.kt        |  6 +++---
 .../ui/component/TransparentHintTextField.kt       |  2 +-
 .../cleannote}/ui/navigation/NoteNavigation.kt     |  6 +++---
 .../cleannote}/ui/navigation/NoteScreen.kt         |  2 +-
 .../cleannote}/ui/theme/Color.kt                   |  2 +-
 .../cleannote}/ui/theme/Shape.kt                   |  2 +-
 .../cleannote}/ui/theme/Theme.kt                   |  7 +------
 .../cleannote}/ui/theme/Type.kt                    |  2 +-
 .../cleannote}/ui/view/edit/AddEditNoteEvent.kt    |  2 +-
 .../cleannote}/ui/view/edit/AddEditNoteScreen.kt   |  6 +++---
 .../ui/view/edit/AddEditNoteViewModel.kt           |  8 ++++----
 .../cleannote}/ui/view/edit/NoteTextFieldState.kt  |  2 +-
 .../cleannote}/ui/view/list/NoteListEvent.kt       |  6 +++---
 .../cleannote}/ui/view/list/NoteListScreen.kt      | 11 +++++------
 .../cleannote/ui/view/list/NoteListState.kt        | 11 +++++++++++
 .../cleannote}/ui/view/list/NoteListViewModel.kt   | 10 +++++-----
 .../ui/view/list/NoteListState.kt                  | 11 -----------
 .../cleannote}/ExampleUnitTest.kt                  |  2 +-
 38 files changed, 98 insertions(+), 105 deletions(-)
 rename app/src/androidTest/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ExampleInstrumentedTest.kt (93%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/MainActivity.kt (84%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/NoteApp.kt (72%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/data/database/NoteDao.kt (78%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/data/database/NoteDatabase.kt (71%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/data/model/Note.kt (78%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/data/repository/NoteRepositoryImpl.kt (67%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/di/DatabaseModule.kt (80%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/di/RepositoryModule.kt (58%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/di/UseCaseModule.kt (53%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/repository/NoteRepository.kt (68%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/usecase/AddNote.kt (64%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/usecase/DeleteNote.kt (51%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/usecase/GetNote.kt (52%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/usecase/GetNotes.kt (78%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/usecase/NoteUseCase.kt (69%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/util/NoteOrder.kt (88%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/domain/util/OrderType.kt (64%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/component/DefaultRadioButton.kt (95%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/component/OrderSection.kt (91%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/component/TransparentHintTextField.kt (95%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/navigation/NoteNavigation.kt (87%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/navigation/NoteScreen.kt (74%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/theme/Color.kt (84%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/theme/Shape.kt (83%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/theme/Theme.kt (85%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/theme/Type.kt (93%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/edit/AddEditNoteEvent.kt (89%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/edit/AddEditNoteScreen.kt (96%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/edit/AddEditNoteViewModel.kt (94%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/edit/NoteTextFieldState.kt (70%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/list/NoteListEvent.kt (57%)
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/list/NoteListScreen.kt (95%)
 create mode 100644 app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListState.kt
 rename app/src/main/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ui/view/list/NoteListViewModel.kt (87%)
 delete mode 100644 app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
 rename app/src/test/java/com/{plcoding/cleanarchitecturenoteapp => ibrahimcanerdogan/cleannote}/ExampleUnitTest.kt (87%)

diff --git a/app/src/androidTest/java/com/plcoding/cleanarchitecturenoteapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
similarity index 93%
rename from app/src/androidTest/java/com/plcoding/cleanarchitecturenoteapp/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
index 19411d6c..e0d259b1 100644
--- a/app/src/androidTest/java/com/plcoding/cleanarchitecturenoteapp/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp
+package com.ibrahimcanerdogan.cleannote
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c79f1fb..16f69dd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.plcoding.cleanarchitecturenoteapp">
+    package="com.ibrahimcanerdogan.cleannote">
 
     <application
-        android:name=".NoteApp"
+        android:name="com.ibrahimcanerdogan.cleannote.NoteApp"
         android:allowBackup="true"
         android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"
@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.CleanArchitectureNoteApp">
         <activity
-            android:name=".MainActivity"
+            android:name="com.ibrahimcanerdogan.cleannote.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.CleanArchitectureNoteApp">
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
similarity index 84%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
index 2a902041..83af557a 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/MainActivity.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp
+package com.ibrahimcanerdogan.cleannote
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -10,8 +10,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.plcoding.cleanarchitecturenoteapp.ui.navigation.NoteNavigation
-import com.plcoding.cleanarchitecturenoteapp.ui.theme.CleanArchitectureNoteAppTheme
+import com.ibrahimcanerdogan.cleannote.ui.navigation.NoteNavigation
+import com.ibrahimcanerdogan.cleannote.ui.theme.CleanArchitectureNoteAppTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/NoteApp.kt
similarity index 72%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/NoteApp.kt
index ec915d87..47d5733f 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/NoteApp.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/NoteApp.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp
+package com.ibrahimcanerdogan.cleannote
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDao.kt
similarity index 78%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDao.kt
index db4f329e..f37e20a4 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDao.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDao.kt
@@ -1,7 +1,7 @@
-package com.plcoding.cleanarchitecturenoteapp.data.database
+package com.ibrahimcanerdogan.cleannote.data.database
 
 import androidx.room.*
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.ibrahimcanerdogan.cleannote.data.model.Note
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDatabase.kt
similarity index 71%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDatabase.kt
index e90f45f7..b850825c 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/database/NoteDatabase.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/database/NoteDatabase.kt
@@ -1,8 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.data.database
+package com.ibrahimcanerdogan.cleannote.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.ibrahimcanerdogan.cleannote.data.model.Note
 
 @Database(
     entities = [Note::class],
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/model/Note.kt
similarity index 78%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/data/model/Note.kt
index e29b6853..4ad952f3 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/model/Note.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/model/Note.kt
@@ -1,8 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.data.model
+package com.ibrahimcanerdogan.cleannote.data.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.plcoding.cleanarchitecturenoteapp.ui.theme.*
+import com.ibrahimcanerdogan.cleannote.ui.theme.*
 
 @Entity(tableName = "note")
 data class Note(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/repository/NoteRepositoryImpl.kt
similarity index 67%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/data/repository/NoteRepositoryImpl.kt
index e29bb226..7f2f46f7 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/data/repository/NoteRepositoryImpl.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/data/repository/NoteRepositoryImpl.kt
@@ -1,8 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.data.repository
+package com.ibrahimcanerdogan.cleannote.data.repository
 
-import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDao
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.data.database.NoteDao
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
 import kotlinx.coroutines.flow.Flow
 
 class NoteRepositoryImpl(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/DatabaseModule.kt
similarity index 80%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/di/DatabaseModule.kt
index a52384a6..8f3aafe6 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/DatabaseModule.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/DatabaseModule.kt
@@ -1,9 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.di
+package com.ibrahimcanerdogan.cleannote.di
 
-import android.app.Application
 import android.content.Context
 import androidx.room.Room
-import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDatabase
+import com.ibrahimcanerdogan.cleannote.data.database.NoteDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/RepositoryModule.kt
similarity index 58%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/di/RepositoryModule.kt
index ef835ddc..d7d8b933 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/RepositoryModule.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/RepositoryModule.kt
@@ -1,8 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.di
+package com.ibrahimcanerdogan.cleannote.di
 
-import com.plcoding.cleanarchitecturenoteapp.data.database.NoteDatabase
-import com.plcoding.cleanarchitecturenoteapp.data.repository.NoteRepositoryImpl
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.data.database.NoteDatabase
+import com.ibrahimcanerdogan.cleannote.data.repository.NoteRepositoryImpl
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/UseCaseModule.kt
similarity index 53%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/di/UseCaseModule.kt
index fbaa6798..4965a76b 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/di/UseCaseModule.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/di/UseCaseModule.kt
@@ -1,11 +1,11 @@
-package com.plcoding.cleanarchitecturenoteapp.di
+package com.ibrahimcanerdogan.cleannote.di
 
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.AddNote
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.DeleteNote
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.GetNote
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.GetNotes
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.domain.usecase.AddNote
+import com.ibrahimcanerdogan.cleannote.domain.usecase.DeleteNote
+import com.ibrahimcanerdogan.cleannote.domain.usecase.GetNote
+import com.ibrahimcanerdogan.cleannote.domain.usecase.GetNotes
+import com.ibrahimcanerdogan.cleannote.domain.usecase.NoteUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/repository/NoteRepository.kt
similarity index 68%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/repository/NoteRepository.kt
index 0efb28de..1ac7b8b6 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/repository/NoteRepository.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/repository/NoteRepository.kt
@@ -1,6 +1,6 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.repository
+package com.ibrahimcanerdogan.cleannote.domain.repository
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
+import com.ibrahimcanerdogan.cleannote.data.model.Note
 import kotlinx.coroutines.flow.Flow
 
 interface NoteRepository {
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/AddNote.kt
similarity index 64%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/AddNote.kt
index 912ef7d3..a296ee49 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/AddNote.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/AddNote.kt
@@ -1,8 +1,8 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+package com.ibrahimcanerdogan.cleannote.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.InvalidNoteException
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.data.model.InvalidNoteException
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
 import javax.inject.Inject
 
 class AddNote @Inject constructor(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/DeleteNote.kt
similarity index 51%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/DeleteNote.kt
index 51e7ab23..67f7c626 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/DeleteNote.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/DeleteNote.kt
@@ -1,7 +1,7 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+package com.ibrahimcanerdogan.cleannote.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
 import javax.inject.Inject
 
 class DeleteNote @Inject constructor(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNote.kt
similarity index 52%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNote.kt
index c6781d29..e6fb60b2 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNote.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNote.kt
@@ -1,7 +1,7 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+package com.ibrahimcanerdogan.cleannote.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
 import javax.inject.Inject
 
 class GetNote @Inject constructor(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNotes.kt
similarity index 78%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNotes.kt
index cd878f20..1f34bb9e 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/GetNotes.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/GetNotes.kt
@@ -1,9 +1,9 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+package com.ibrahimcanerdogan.cleannote.domain.usecase
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.repository.NoteRepository
-import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.repository.NoteRepository
+import com.ibrahimcanerdogan.cleannote.domain.util.NoteOrder
+import com.ibrahimcanerdogan.cleannote.domain.util.OrderType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/NoteUseCase.kt
similarity index 69%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/NoteUseCase.kt
index 9addeb7d..99cd5608 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/usecase/NoteUseCase.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/usecase/NoteUseCase.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.usecase
+package com.ibrahimcanerdogan.cleannote.domain.usecase
 
 data class NoteUseCase(
     val getNotes: GetNotes,
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/NoteOrder.kt
similarity index 88%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/NoteOrder.kt
index aad4dd2b..732abe55 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/NoteOrder.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/NoteOrder.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.util
+package com.ibrahimcanerdogan.cleannote.domain.util
 
 sealed class NoteOrder(val orderType: OrderType) {
     class Title(orderType: OrderType): NoteOrder(orderType)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/OrderType.kt
similarity index 64%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/OrderType.kt
index dbc32331..6fdc0e83 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/domain/util/OrderType.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/domain/util/OrderType.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.domain.util
+package com.ibrahimcanerdogan.cleannote.domain.util
 
 sealed class OrderType {
     data object Ascending: OrderType()
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/DefaultRadioButton.kt
similarity index 95%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/DefaultRadioButton.kt
index 5d9a7b9a..ed94208b 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/DefaultRadioButton.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/DefaultRadioButton.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.component
+package com.ibrahimcanerdogan.cleannote.ui.component
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/OrderSection.kt
similarity index 91%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/OrderSection.kt
index f333a018..e05fbd6f 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/OrderSection.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/OrderSection.kt
@@ -1,11 +1,11 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.component
+package com.ibrahimcanerdogan.cleannote.ui.component
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
+import com.ibrahimcanerdogan.cleannote.domain.util.NoteOrder
+import com.ibrahimcanerdogan.cleannote.domain.util.OrderType
 
 @Composable
 fun OrderSection(
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/TransparentHintTextField.kt
similarity index 95%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/TransparentHintTextField.kt
index e6cd0dcd..a0888f60 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/component/TransparentHintTextField.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/component/TransparentHintTextField.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.component
+package com.ibrahimcanerdogan.cleannote.ui.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
similarity index 87%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
index 4fb44ce8..a0e7a4ff 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteNavigation.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.navigation
+package com.ibrahimcanerdogan.cleannote.ui.navigation
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
@@ -8,8 +8,8 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import com.plcoding.cleanarchitecturenoteapp.ui.view.edit.AddEditNoteScreen
-import com.plcoding.cleanarchitecturenoteapp.ui.view.list.NoteListScreen
+import com.ibrahimcanerdogan.cleannote.ui.view.edit.AddEditNoteScreen
+import com.ibrahimcanerdogan.cleannote.ui.view.list.NoteListScreen
 
 @ExperimentalAnimationApi
 @Composable
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteScreen.kt
similarity index 74%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteScreen.kt
index 04ac30e9..e7a13c46 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/navigation/NoteScreen.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteScreen.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.navigation
+package com.ibrahimcanerdogan.cleannote.ui.navigation
 
 sealed class NoteScreen(val route: String) {
     data object NotesScreen: NoteScreen("notes_screen")
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Color.kt
similarity index 84%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Color.kt
index 1ebeddb0..bc534250 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Color.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.theme
+package com.ibrahimcanerdogan.cleannote.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Shape.kt
similarity index 83%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Shape.kt
index 1f872ff6..fb5eaebf 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Shape.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Shape.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.theme
+package com.ibrahimcanerdogan.cleannote.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Shapes
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
similarity index 85%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
index e840757f..615562ab 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
@@ -1,6 +1,5 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.theme
+package com.ibrahimcanerdogan.cleannote.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -9,12 +8,8 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Color.White,
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Type.kt
similarity index 93%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Type.kt
index e4befb58..9ddba820 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/theme/Type.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.theme
+package com.ibrahimcanerdogan.cleannote.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteEvent.kt
similarity index 89%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteEvent.kt
index a5347565..9dae1160 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteEvent.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteEvent.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
+package com.ibrahimcanerdogan.cleannote.ui.view.edit
 
 import androidx.compose.ui.focus.FocusState
 
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteScreen.kt
similarity index 96%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteScreen.kt
index 9f295ff8..6bb4962a 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteScreen.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteScreen.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
+package com.ibrahimcanerdogan.cleannote.ui.view.edit
 
 import androidx.compose.animation.Animatable
 import androidx.compose.animation.core.tween
@@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.ui.component.TransparentHintTextField
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.ui.component.TransparentHintTextField
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteViewModel.kt
similarity index 94%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteViewModel.kt
index 19ddddf5..60fc564b 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/AddEditNoteViewModel.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/AddEditNoteViewModel.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
+package com.ibrahimcanerdogan.cleannote.ui.view.edit
 
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableIntStateOf
@@ -7,9 +7,9 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.plcoding.cleanarchitecturenoteapp.data.model.InvalidNoteException
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
+import com.ibrahimcanerdogan.cleannote.data.model.InvalidNoteException
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.usecase.NoteUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/NoteTextFieldState.kt
similarity index 70%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/NoteTextFieldState.kt
index e52cb3fa..d9f244f6 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/edit/NoteTextFieldState.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/edit/NoteTextFieldState.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.edit
+package com.ibrahimcanerdogan.cleannote.ui.view.edit
 
 data class NoteTextFieldState(
     val stateText: String = "",
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListEvent.kt
similarity index 57%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListEvent.kt
index 4d55531d..9f5d2e09 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListEvent.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListEvent.kt
@@ -1,7 +1,7 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+package com.ibrahimcanerdogan.cleannote.ui.view.list
 
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.util.NoteOrder
 
 sealed class NoteListEvent {
     data class Order(val noteOrder: NoteOrder): NoteListEvent()
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
similarity index 95%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
index 262eef00..0055f478 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListScreen.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+package com.ibrahimcanerdogan.cleannote.ui.view.list
 
 import androidx.compose.animation.*
 import androidx.compose.foundation.clickable
@@ -8,7 +8,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Sort
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -17,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.plcoding.cleanarchitecturenoteapp.ui.component.OrderSection
-import com.plcoding.cleanarchitecturenoteapp.ui.navigation.NoteScreen
+import com.ibrahimcanerdogan.cleannote.ui.component.OrderSection
+import com.ibrahimcanerdogan.cleannote.ui.navigation.NoteScreen
 import kotlinx.coroutines.launch
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.shape.CircleShape
@@ -37,8 +36,8 @@ import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.core.graphics.ColorUtils
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.ui.theme.DarkGray
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.ui.theme.DarkGray
 
 @ExperimentalAnimationApi
 @Composable
diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListState.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListState.kt
new file mode 100644
index 00000000..92bec41b
--- /dev/null
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListState.kt
@@ -0,0 +1,11 @@
+package com.ibrahimcanerdogan.cleannote.ui.view.list
+
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.util.NoteOrder
+import com.ibrahimcanerdogan.cleannote.domain.util.OrderType
+
+data class NoteListState(
+    val notes: List<Note> = emptyList(),
+    val noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
+    val isOrderSectionVisible: Boolean = false
+)
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListViewModel.kt
similarity index 87%
rename from app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt
rename to app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListViewModel.kt
index 31bf4faa..58555c51 100644
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListViewModel.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListViewModel.kt
@@ -1,13 +1,13 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.list
+package com.ibrahimcanerdogan.cleannote.ui.view.list
 
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.usecase.NoteUseCase
-import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
+import com.ibrahimcanerdogan.cleannote.data.model.Note
+import com.ibrahimcanerdogan.cleannote.domain.usecase.NoteUseCase
+import com.ibrahimcanerdogan.cleannote.domain.util.NoteOrder
+import com.ibrahimcanerdogan.cleannote.domain.util.OrderType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
diff --git a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt b/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
deleted file mode 100644
index acad126f..00000000
--- a/app/src/main/java/com/plcoding/cleanarchitecturenoteapp/ui/view/list/NoteListState.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.plcoding.cleanarchitecturenoteapp.ui.view.list
-
-import com.plcoding.cleanarchitecturenoteapp.data.model.Note
-import com.plcoding.cleanarchitecturenoteapp.domain.util.NoteOrder
-import com.plcoding.cleanarchitecturenoteapp.domain.util.OrderType
-
-data class NoteListState(
-    val notes: List<Note> = emptyList(),
-    val noteOrder: NoteOrder = NoteOrder.Date(OrderType.Descending),
-    val isOrderSectionVisible: Boolean = false
-)
diff --git a/app/src/test/java/com/plcoding/cleanarchitecturenoteapp/ExampleUnitTest.kt b/app/src/test/java/com/ibrahimcanerdogan/cleannote/ExampleUnitTest.kt
similarity index 87%
rename from app/src/test/java/com/plcoding/cleanarchitecturenoteapp/ExampleUnitTest.kt
rename to app/src/test/java/com/ibrahimcanerdogan/cleannote/ExampleUnitTest.kt
index 6b05f878..5416e2e8 100644
--- a/app/src/test/java/com/plcoding/cleanarchitecturenoteapp/ExampleUnitTest.kt
+++ b/app/src/test/java/com/ibrahimcanerdogan/cleannote/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.plcoding.cleanarchitecturenoteapp
+package com.ibrahimcanerdogan.cleannote
 
 import org.junit.Test
 

From 7b4038d5964cf4d2c0558afc2948a056a086040e Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Fri, 13 Dec 2024 00:34:13 +0300
Subject: [PATCH 10/14] Namespace renamed.

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index aa561e4b..26108a3d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-    namespace = "com.plcoding.cleanarchitecturenoteapp"
+    namespace = "com.ibrahimcanerdogan.cleannote"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.plcoding.cleanarchitecturenoteapp"
+        applicationId = "com.ibrahimcanerdogan.cleannote"
         minSdk = 24
         targetSdk = 34
         versionCode = 1

From 0e0cc6ab634102a3edce3f92e10385e3a63ef8e5 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Fri, 13 Dec 2024 00:37:37 +0300
Subject: [PATCH 11/14] Scaffold bug fixed.

---
 .../java/com/ibrahimcanerdogan/cleannote/MainActivity.kt | 9 +++------
 .../cleannote/ui/navigation/NoteNavigation.kt            | 4 +---
 .../cleannote/ui/view/list/NoteListScreen.kt             | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
index 83af557a..0e66eb37 100644
--- a/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
@@ -8,6 +8,7 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.ibrahimcanerdogan.cleannote.ui.navigation.NoteNavigation
@@ -23,12 +24,8 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             CleanArchitectureNoteAppTheme {
-                Scaffold (
-                    modifier = Modifier.fillMaxSize()
-                ) { paddingValues ->
-                    NoteNavigation(
-                        modifier = Modifier.fillMaxSize().padding(paddingValues)
-                    )
+                Surface {
+                    NoteNavigation()
                 }
             }
         }
diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
index a0e7a4ff..489cd349 100644
--- a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/navigation/NoteNavigation.kt
@@ -11,12 +11,10 @@ import androidx.navigation.navArgument
 import com.ibrahimcanerdogan.cleannote.ui.view.edit.AddEditNoteScreen
 import com.ibrahimcanerdogan.cleannote.ui.view.list.NoteListScreen
 
-@ExperimentalAnimationApi
 @Composable
-fun NoteNavigation(modifier: Modifier) {
+fun NoteNavigation() {
     val navController = rememberNavController()
     NavHost(
-        modifier = modifier,
         navController = navController,
         startDestination = NoteScreen.NotesScreen.route
     ) {
diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
index 0055f478..16a47d1b 100644
--- a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/view/list/NoteListScreen.kt
@@ -39,7 +39,6 @@ import androidx.core.graphics.ColorUtils
 import com.ibrahimcanerdogan.cleannote.data.model.Note
 import com.ibrahimcanerdogan.cleannote.ui.theme.DarkGray
 
-@ExperimentalAnimationApi
 @Composable
 fun NoteListScreen(
     navController: NavController,

From 749e6e3bc13cb9571013201616d3818547931f83 Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Fri, 13 Dec 2024 00:40:27 +0300
Subject: [PATCH 12/14] App name configured.

---
 .idea/.name                                               | 2 +-
 .../cleannote/ExampleInstrumentedTest.kt                  | 2 +-
 app/src/main/AndroidManifest.xml                          | 4 ++--
 .../java/com/ibrahimcanerdogan/cleannote/MainActivity.kt  | 8 ++------
 .../com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt     | 2 +-
 app/src/main/res/values/strings.xml                       | 2 +-
 app/src/main/res/values/themes.xml                        | 2 +-
 settings.gradle.kts                                       | 2 +-
 8 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.idea/.name b/.idea/.name
index ef8486eb..c968170e 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-CleanArchitectureNoteApp
\ No newline at end of file
+CleanNoteApp
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
index e0d259b1..d0b17737 100644
--- a/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/ibrahimcanerdogan/cleannote/ExampleInstrumentedTest.kt
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.plcoding.cleanarchitecturenoteapp", appContext.packageName)
+        assertEquals("com.ibrahimcanerdogan.cleannote", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16f69dd2..5dfd8ddf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/icon_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.CleanArchitectureNoteApp">
+        android:theme="@style/Theme.CleanNoteApp">
         <activity
             android:name="com.ibrahimcanerdogan.cleannote.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.CleanArchitectureNoteApp">
+            android:theme="@style/Theme.CleanNoteApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
index 0e66eb37..69e0cccc 100644
--- a/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/MainActivity.kt
@@ -5,14 +5,10 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.ibrahimcanerdogan.cleannote.ui.navigation.NoteNavigation
-import com.ibrahimcanerdogan.cleannote.ui.theme.CleanArchitectureNoteAppTheme
+import com.ibrahimcanerdogan.cleannote.ui.theme.CleanNoteAppTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -23,7 +19,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            CleanArchitectureNoteAppTheme {
+            CleanNoteAppTheme {
                 Surface {
                     NoteNavigation()
                 }
diff --git a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
index 615562ab..e74bac3d 100644
--- a/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
+++ b/app/src/main/java/com/ibrahimcanerdogan/cleannote/ui/theme/Theme.kt
@@ -28,7 +28,7 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun CleanArchitectureNoteAppTheme(
+fun CleanNoteAppTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3eec93a..6dc35484 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">CleanArchitectureNoteApp</string>
+    <string name="app_name">Clean Note</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
index 3d0dccbe..33a1f20f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,3 +1,3 @@
 <resources>
-    <style name="Theme.CleanArchitectureNoteApp" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.CleanNoteApp" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 26b99f65..a6e2f3d4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,5 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "CleanArchitectureNoteApp"
+rootProject.name = "CleanNoteApp"
 include(":app")
\ No newline at end of file

From 73c6433099449aaaa617107b94b7224a5cecadba Mon Sep 17 00:00:00 2001
From: ibrahimcanaydogan <ibrahim4545erdogan@gmail.com>
Date: Fri, 13 Dec 2024 00:40:54 +0300
Subject: [PATCH 13/14] android:name changed.

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5dfd8ddf..d365a59a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="com.ibrahimcanerdogan.cleannote">
 
     <application
-        android:name="com.ibrahimcanerdogan.cleannote.NoteApp"
+        android:name=".NoteApp"
         android:allowBackup="true"
         android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"

From 0262777d06e484c33be6b50c7e0d05d3770fbb1e Mon Sep 17 00:00:00 2001
From: ibrahimbusiness <ibrahim.erdogan@partner.intetra.com.tr>
Date: Tue, 17 Jun 2025 13:43:37 +0300
Subject: [PATCH 14/14] Dependencies updated and KSP migration.

---
 .idea/AndroidProjectSystem.xml           |  6 ++++++
 .idea/deploymentTargetSelector.xml       |  8 ++++++++
 .idea/misc.xml                           |  1 +
 app/build.gradle.kts                     | 26 ++++++++++--------------
 build.gradle.kts                         |  1 +
 gradle/libs.versions.toml                | 12 +++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 .idea/AndroidProjectSystem.xml

diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef36..8493627b 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-06-17T09:32:01.363331Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ibrahimbusiness/.android/avd/Pixel_9_Pro.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 55c0ec2c..0ad17cbd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 26108a3d..bc76a4f2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    id("kotlin-kapt")
+    id("com.google.devtools.ksp")
     id("com.google.dagger.hilt.android")
 }
 
@@ -60,30 +60,26 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
 
     // Compose dependencies
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
-    implementation("androidx.navigation:navigation-compose:2.8.3")
-    implementation("androidx.compose.material:material-icons-extended:1.7.5")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1")
+    implementation("androidx.navigation:navigation-compose:2.9.0")
+    implementation("androidx.compose.material:material-icons-extended:1.7.8")
     implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
 
     // Coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
 
     //Dagger - Hilt
     implementation("com.google.dagger:hilt-android:2.49")
-    kapt("com.google.dagger:hilt-android-compiler:2.49")
-    kapt("androidx.hilt:hilt-compiler:1.0.0")
+    ksp("com.google.dagger:hilt-android-compiler:2.49")
+    ksp("androidx.hilt:hilt-compiler:1.0.0")
 
     // Room
-    implementation("androidx.room:room-runtime:2.6.1")
-    kapt("androidx.room:room-compiler:2.6.1")
-    implementation("androidx.room:room-ktx:2.6.1")
+    implementation("androidx.room:room-runtime:2.7.1")
+    ksp("androidx.room:room-compiler:2.7.1")
+    implementation("androidx.room:room-ktx:2.7.1")
 
     // Splash Screen
     implementation("androidx.core:core-splashscreen:1.0.0")
 
-}
-
-kapt {
-    correctErrorTypes = true
 }
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 6735ebdd..d1069df5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,5 +3,6 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
+    id("com.google.devtools.ksp") version "2.0.21-1.0.27" apply false
     id("com.google.dagger.hilt.android") version "2.49" apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 133a0247..85da05e1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.7.2"
-kotlin = "2.0.10"
-coreKtx = "1.15.0"
+agp = "8.10.1"
+kotlin = "2.1.21"
+coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.7"
-activityCompose = "1.9.3"
-composeBom = "2024.10.01"
+lifecycleRuntimeKtx = "2.9.1"
+activityCompose = "1.10.1"
+composeBom = "2025.06.00"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3074de35..5d4f00af 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Nov 12 23:45:49 TRT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists