From aaeb01307968e4f756caaca5cc294f2ebda66e6e Mon Sep 17 00:00:00 2001
From: huntams <dissirina2904@gmail.com>
Date: Sat, 1 Apr 2023 12:22:04 +0300
Subject: [PATCH 1/5] lesson5

---
 app/src/main/AndroidManifest.xml              |  2 +
 .../example/three_lines/DataListAdapter.kt    |  2 +-
 .../com/example/three_lines/MainActivity.kt   | 33 ++++---------
 .../second_activity/SecondActivity.kt         | 28 +++++++++++
 app/src/main/res/layout/activity_main.xml     | 46 ++++++-------------
 app/src/main/res/layout/activity_second.xml   | 12 +++++
 6 files changed, 67 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
 create mode 100644 app/src/main/res/layout/activity_second.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 05ea30b..21ec1bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".second_activity.SecondActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/DataListAdapter.kt b/app/src/main/java/com/example/three_lines/DataListAdapter.kt
index 8d7af79..c36b229 100644
--- a/app/src/main/java/com/example/three_lines/DataListAdapter.kt
+++ b/app/src/main/java/com/example/three_lines/DataListAdapter.kt
@@ -10,7 +10,7 @@ import com.example.three_lines.databinding.ViewContactBinding
 
 class DataListAdapter : ListAdapter<DataModel, DataListAdapter.DataViewHolder>(diffUtilCallback) {
 
-    private var onClick : ( DataModel,String)-> Unit = {}
+    private var onClick : ( DataModel)-> Unit = {}
     fun setCallback(callback :(DataModel) -> Unit){
         this.onClick = callback
     }
diff --git a/app/src/main/java/com/example/three_lines/MainActivity.kt b/app/src/main/java/com/example/three_lines/MainActivity.kt
index 87aedc4..bcd2497 100644
--- a/app/src/main/java/com/example/three_lines/MainActivity.kt
+++ b/app/src/main/java/com/example/three_lines/MainActivity.kt
@@ -1,9 +1,11 @@
 package com.example.three_lines
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
 import com.example.three_lines.databinding.ActivityMainBinding
+import com.example.three_lines.second_activity.SecondActivity
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -12,7 +14,7 @@ class MainActivity : AppCompatActivity() {
         DataListAdapter()
     }
 
-    /*
+
         private val dataList = listOf(
             DataModel("rand1","subrand2"),
             DataModel("rand3","subrand4"),
@@ -20,39 +22,24 @@ class MainActivity : AppCompatActivity() {
             DataModel("rand7","subrand8"),
 
             )
-     */
-    private val dataList = mutableListOf<DataModel>().apply {
+
+    /*private val dataList = mutableListOf<DataModel>().apply {
         repeat(10) {
             add(DataModel())
         }
 
     }
 
+     */
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        var size: Int = 0
-        binding.recyclerView.adapter = listAdapter
-        binding.ButtonAdd.setOnClickListener {
-            dataList.add(DataModel())
-            listAdapter.submitList(dataList.toList())
-            //size++
-            //listAdapter.submitList(dataList.take(size))
-
+        binding.buttonAction.setOnClickListener {
+            val text = binding.editText.text.toString()
+            startActivity(SecondActivity.createIntent(this,text))
         }
-        binding.ButtonRemove.setOnClickListener {
-            //if(size!=0) {
-            //   size--
-            //  listAdapter.submitList(dataList.take(size))
-            //}
-            dataList.removeLastOrNull()
-            listAdapter.submitList(dataList.toList())
         }
-        listAdapter.setCallback { model ->
-            Toast.makeText(this, model.title, Toast.LENGTH_LONG).show()
-        }
-        binding.recyclerView.adapter = listAdapter
-    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt b/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
new file mode 100644
index 0000000..b6c1ede
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
@@ -0,0 +1,28 @@
+package com.example.three_lines.second_activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.three_lines.databinding.ActivitySecondBinding
+
+class SecondActivity : AppCompatActivity() {
+
+    companion object{
+        private const val ARG_TEXT_KEY = "ARG_TEXT_KEY"
+
+        fun createIntent(context : Context,text: String) = Intent(context,SecondActivity::class.java).apply {
+            putExtra(ARG_TEXT_KEY,text)
+        }
+    }
+    private lateinit var binding: ActivitySecondBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySecondBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val text = intent.extras?.getString(ARG_TEXT_KEY)
+        binding.textView.text = text
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c01fb49..4660d57 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,37 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="4"
-            tools:listitem="@layout/view_contact">
+        android:id="@+id/editText"/>
 
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <Button
-            android:id="@+id/ButtonAdd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:hint="Добавить"
-            android:textColorHint="@color/white" />
-
-        <Button
-            android:id="@+id/ButtonRemove"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:hint="Удалить"
-            android:textColorHint="@color/white" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    <Button
+        android:id="@+id/buttonAction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
new file mode 100644
index 0000000..85d078f
--- /dev/null
+++ b/app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:id="@+id/textView"
+        android:text="rand"/>
+</LinearLayout>
\ No newline at end of file

From 299db2599daccafca50c74149aeb38c702df4d01 Mon Sep 17 00:00:00 2001
From: huntams <dissirina2904@gmail.com>
Date: Tue, 4 Apr 2023 17:19:46 +0300
Subject: [PATCH 2/5] lesson6

---
 app/build.gradle                              |  8 +++--
 .../com/example/three_lines/MainActivity.kt   |  4 ---
 .../three_lines/fragment1/FirstFragment.kt    | 29 ++++++++++++++++
 .../three_lines/fragment2/SecondFragment.kt   | 23 +++++++++++++
 app/src/main/res/layout/activity_main.xml     | 16 ++++-----
 app/src/main/res/layout/fragment_first.xml    | 19 +++++++++++
 app/src/main/res/layout/second_fragment.xml   | 15 ++++++++
 app/src/main/res/navigation/nav_graph.xml     | 34 +++++++++++++++++++
 build.gradle                                  | 12 ++++++-
 9 files changed, 145 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
 create mode 100644 app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_first.xml
 create mode 100644 app/src/main/res/layout/second_fragment.xml
 create mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0cc121a..1725a3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'androidx.navigation.safeargs'
 }
 
 android {
@@ -35,9 +36,12 @@ android {
         viewBinding true
     }
 }
-
 dependencies {
-
+    // reflection-free flavor
+    implementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.8'
+    def nav_version = "2.5.3"
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
diff --git a/app/src/main/java/com/example/three_lines/MainActivity.kt b/app/src/main/java/com/example/three_lines/MainActivity.kt
index bcd2497..fa1765f 100644
--- a/app/src/main/java/com/example/three_lines/MainActivity.kt
+++ b/app/src/main/java/com/example/three_lines/MainActivity.kt
@@ -36,10 +36,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.buttonAction.setOnClickListener {
-            val text = binding.editText.text.toString()
-            startActivity(SecondActivity.createIntent(this,text))
-        }
         }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt b/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
new file mode 100644
index 0000000..b63e538
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
@@ -0,0 +1,29 @@
+package com.example.three_lines.fragment1
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import by.kirich1409.viewbindingdelegate.viewBinding
+import com.example.three_lines.R
+import com.example.three_lines.databinding.FragmentFirstBinding
+
+class FirstFragment : Fragment(R.layout.fragment_first) {
+
+    private val binding by viewBinding(FragmentFirstBinding::bind)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        super.onViewCreated(view, savedInstanceState)
+        binding.button.setOnClickListener {
+            val text = binding.editText.text.toString()
+            findNavController().navigate(
+                FirstFragmentDirections.actionFirstFragmentToSecondFragment13()
+            )
+            findNavController().popBackStack()
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt b/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
new file mode 100644
index 0000000..6dda49a
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
@@ -0,0 +1,23 @@
+package com.example.three_lines.fragment2
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.navArgs
+import by.kirich1409.viewbindingdelegate.viewBinding
+import com.example.three_lines.R
+import com.example.three_lines.databinding.SecondFragmentBinding
+import com.example.three_lines.fragment1.FirstFragment
+
+class SecondFragment : Fragment(R.layout.second_fragment) {
+    private val binding by viewBinding(SecondFragmentBinding:: bind)
+    private val args by navArgs<SecondFragmentArgs>()
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.textViewText.text = args.text
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4660d57..d1772e7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,17 +3,17 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/editText"/>
 
-    <Button
-        android:id="@+id/buttonAction"
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center" />
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
new file mode 100644
index 0000000..cea7234
--- /dev/null
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp">
+    <EditText
+        android:id="@+id/editText"
+        android:hint="Text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+    <Button
+        android:id="@+id/button"
+        android:hint="press"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/second_fragment.xml b/app/src/main/res/layout/second_fragment.xml
new file mode 100644
index 0000000..b584c28
--- /dev/null
+++ b/app/src/main/res/layout/second_fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MissingDefaultResource">
+    <TextView
+        android:id="@+id/textViewText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textSize="36dp"
+        android:text="RAND"
+        android:gravity="center"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..b6fbb0b
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph"
+    app:startDestination="@id/firstFragment">
+
+    <fragment
+        android:id="@+id/firstFragment"
+        tools:layout="@layout/fragment_first"
+        android:name="com.example.three_lines.fragment1.FirstFragment"
+        android:label="FirstFragment" >
+        <action
+            android:id="@+id/action_firstFragment_to_secondFragment13"
+            app:destination="@id/secondFragment" >
+            <argument
+                android:name="text"
+                android:defaultValue="hh" />
+        </action>
+    </fragment>
+    <fragment
+        android:id="@+id/secondFragment"
+        android:name="com.example.three_lines.fragment2.SecondFragment"
+        android:label="SecondFragment"
+        tools:layout="@layout/second_fragment"
+        >
+        <argument
+            android:name="text"
+            app:argType="string"
+            app:nullable="true"
+            android:defaultValue="test" />
+    </fragment>
+
+</navigation>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ab2b874..979f41e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+    }
+    dependencies {
+        def nav_version = "2.5.3"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+    }
+}
 plugins {
+
     id 'com.android.application' version '7.4.2' apply false
     id 'com.android.library' version '7.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-}
\ No newline at end of file
+}

From de43864971e60848925dc3fa73ff99ab51551a15 Mon Sep 17 00:00:00 2001
From: huntams <dissirina2904@gmail.com>
Date: Sat, 8 Apr 2023 13:26:57 +0300
Subject: [PATCH 3/5] lesson7

---
 app/build.gradle                              |  7 +++
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/com/example/three_lines/data/Note.kt |  8 +++
 .../three_lines/data/NotesDataSource.kt       |  8 +++
 .../data/repository/NoteRepositoryImpl.kt     | 16 ++++++
 .../data/repository/NotesRepository.kt        |  8 +++
 .../three_lines/domain/AddNoteUseCase.kt      | 11 ++++
 .../three_lines/domain/GetNotesUseCase.kt     | 13 +++++
 .../three_lines/fragment1/FirstFragment.kt    |  3 --
 .../three_lines/fragment2/SecondFragment.kt   |  2 -
 .../{ => presentation}/MainActivity.kt        | 23 +-------
 .../presentation/list/NoteListAdapter.kt      | 46 ++++++++++++++++
 .../presentation/list/NoteListFragment.kt     | 52 +++++++++++++++++++
 .../presentation/list/NotesListViewModel.kt   | 24 +++++++++
 .../main/res/drawable/ic_add_quick_note.xml   | 13 +++++
 .../main/res/layout/fragment_note_list.xml    | 31 +++++++++++
 app/src/main/res/layout/item_note.xml         | 17 ++++++
 app/src/main/res/navigation/nav_graph.xml     | 32 +++---------
 app/src/main/res/values/strings.xml           |  1 +
 19 files changed, 263 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/com/example/three_lines/data/Note.kt
 create mode 100644 app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
 create mode 100644 app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
 create mode 100644 app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
 create mode 100644 app/src/main/java/com/example/three_lines/domain/AddNoteUseCase.kt
 create mode 100644 app/src/main/java/com/example/three_lines/domain/GetNotesUseCase.kt
 rename app/src/main/java/com/example/three_lines/{ => presentation}/MainActivity.kt (54%)
 create mode 100644 app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
 create mode 100644 app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
 create mode 100644 app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
 create mode 100644 app/src/main/res/drawable/ic_add_quick_note.xml
 create mode 100644 app/src/main/res/layout/fragment_note_list.xml
 create mode 100644 app/src/main/res/layout/item_note.xml

diff --git a/app/build.gradle b/app/build.gradle
index 1725a3c..b7302c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,6 +37,13 @@ android {
     }
 }
 dependencies {
+    def lifecycle_version = "2.6.1"
+    def arch_version = "2.2.0"
+
+    // ViewModel
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    // LiveData
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     // reflection-free flavor
     implementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.8'
     def nav_version = "2.5.3"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21ec1bc..ed7b7e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.Three_lines"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/three_lines/data/Note.kt b/app/src/main/java/com/example/three_lines/data/Note.kt
new file mode 100644
index 0000000..9253b3d
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/data/Note.kt
@@ -0,0 +1,8 @@
+package com.example.three_lines.data
+
+import java.util.*
+
+data class Note(
+    val id : String = UUID.randomUUID().toString(),
+    val text : String,
+)
diff --git a/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
new file mode 100644
index 0000000..f3da69d
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
@@ -0,0 +1,8 @@
+package com.example.three_lines.data
+
+object NotesDataSource {
+    val notesList = mutableListOf<Note>()
+    fun addNote(text : String){
+        notesList.add(Note(text = text))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
new file mode 100644
index 0000000..8b66210
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
@@ -0,0 +1,16 @@
+package com.example.three_lines.data.repository
+
+import com.example.three_lines.data.Note
+import com.example.three_lines.data.NotesDataSource
+
+class NoteRepositoryImpl(
+    private val notesDataSource : NotesDataSource = NotesDataSource
+) : NotesRepository {
+    override fun getNotes(): List<Note> {
+            return notesDataSource.notesList
+    }
+
+    override fun addNote(text: String) {
+        notesDataSource.addNote(text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
new file mode 100644
index 0000000..9adc262
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
@@ -0,0 +1,8 @@
+package com.example.three_lines.data.repository
+
+import com.example.three_lines.data.Note
+
+interface NotesRepository {
+    fun getNotes() : List<Note>
+    fun addNote(text: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/domain/AddNoteUseCase.kt b/app/src/main/java/com/example/three_lines/domain/AddNoteUseCase.kt
new file mode 100644
index 0000000..80ccbbd
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/domain/AddNoteUseCase.kt
@@ -0,0 +1,11 @@
+package com.example.three_lines.domain
+
+import com.example.three_lines.data.repository.NoteRepositoryImpl
+import com.example.three_lines.data.repository.NotesRepository
+
+class AddNoteUseCase(private val notesRepository : NotesRepository = NoteRepositoryImpl()
+) {
+    fun execute(text: String){
+        notesRepository.addNote(text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/domain/GetNotesUseCase.kt b/app/src/main/java/com/example/three_lines/domain/GetNotesUseCase.kt
new file mode 100644
index 0000000..38e3d66
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/domain/GetNotesUseCase.kt
@@ -0,0 +1,13 @@
+package com.example.three_lines.domain
+
+import com.example.three_lines.data.Note
+import com.example.three_lines.data.repository.NoteRepositoryImpl
+import com.example.three_lines.data.repository.NotesRepository
+
+class GetNotesUseCase(
+    private val notesRepository: NotesRepository = NoteRepositoryImpl()
+) {
+    fun execute(): List<Note>{
+        return notesRepository.getNotes()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt b/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
index b63e538..d6a7ac0 100644
--- a/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
+++ b/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
@@ -19,9 +19,6 @@ class FirstFragment : Fragment(R.layout.fragment_first) {
         super.onViewCreated(view, savedInstanceState)
         binding.button.setOnClickListener {
             val text = binding.editText.text.toString()
-            findNavController().navigate(
-                FirstFragmentDirections.actionFirstFragmentToSecondFragment13()
-            )
             findNavController().popBackStack()
         }
 
diff --git a/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt b/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
index 6dda49a..a118b2c 100644
--- a/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
+++ b/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
@@ -13,11 +13,9 @@ import com.example.three_lines.fragment1.FirstFragment
 
 class SecondFragment : Fragment(R.layout.second_fragment) {
     private val binding by viewBinding(SecondFragmentBinding:: bind)
-    private val args by navArgs<SecondFragmentArgs>()
 
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.textViewText.text = args.text
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/MainActivity.kt b/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
similarity index 54%
rename from app/src/main/java/com/example/three_lines/MainActivity.kt
rename to app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
index fa1765f..6824fa5 100644
--- a/app/src/main/java/com/example/three_lines/MainActivity.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.three_lines
+package com.example.three_lines.presentation
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -10,27 +10,6 @@ import com.example.three_lines.second_activity.SecondActivity
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
-    private val listAdapter by lazy {
-        DataListAdapter()
-    }
-
-
-        private val dataList = listOf(
-            DataModel("rand1","subrand2"),
-            DataModel("rand3","subrand4"),
-            DataModel("rand5","subrand6"),
-            DataModel("rand7","subrand8"),
-
-            )
-
-    /*private val dataList = mutableListOf<DataModel>().apply {
-        repeat(10) {
-            add(DataModel())
-        }
-
-    }
-
-     */
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt b/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
new file mode 100644
index 0000000..69b631d
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
@@ -0,0 +1,46 @@
+package com.example.three_lines.presentation.list
+
+import android.view.LayoutInflater
+import android.view.ScrollCaptureCallback
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.example.three_lines.DataModel
+import com.example.three_lines.data.Note
+import com.example.three_lines.databinding.FragmentNoteListBinding
+import com.example.three_lines.databinding.ItemNoteBinding
+import com.example.three_lines.databinding.ViewContactBinding
+
+class NoteListAdapter : ListAdapter<Note,NoteListAdapter.NoteViewHolder>(diffUtil)  {
+    private var onNoteClick : (Note) -> Unit = {}
+    fun setCallBack(callback: (Note)->Unit){
+        this.onNoteClick = callback
+    }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NoteViewHolder {
+        val binding = ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return NoteViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: NoteViewHolder, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    inner class NoteViewHolder(
+        private var binding: ItemNoteBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: Note) {
+            with(binding){
+                root.setOnClickListener { onNoteClick(item) }
+                textViewText.text = item.text
+            }
+        }
+    }
+}
+val diffUtil = object : DiffUtil.ItemCallback<Note>() {
+
+    override fun areContentsTheSame(oldItem: Note, newItem: Note) = oldItem==newItem
+
+    override fun areItemsTheSame(oldItem: Note, newItem: Note)= oldItem.id == newItem.id
+}
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
new file mode 100644
index 0000000..af61f45
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
@@ -0,0 +1,52 @@
+package com.example.three_lines.presentation.list
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import by.kirich1409.viewbindingdelegate.viewBinding
+import com.example.three_lines.R
+import com.example.three_lines.databinding.FragmentNoteListBinding
+
+class NoteListFragment : Fragment(R.layout.fragment_note_list) {
+    companion object {
+        private const val MOCK_TEXT =
+            "Note text that resizes the card vertically to fit itself. It can be very long, but let’s settle on 180 characters as the limit"
+
+    }
+
+    private val binding by viewBinding(FragmentNoteListBinding::bind)
+    private val viewModel by viewModels<NotesListViewModel>()
+    private val listAdapter = NoteListAdapter()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel.getNotes()
+        with(binding) {
+            /*
+            toolbar.setNavigationOnClickListener {
+                findNavController().popBackStack()
+            }
+
+             */
+            recyclerview.apply {
+
+
+                layoutManager = StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
+                adapter = listAdapter.apply {
+                    setCallBack { note ->
+                        Toast.makeText(requireContext(), note.text, Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+            floatingActionButton.setOnClickListener {
+                viewModel.onAddClicked(MOCK_TEXT)
+            }
+            viewModel.notesListLiveData.observe(viewLifecycleOwner) {
+                listAdapter.submitList(it)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt b/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
new file mode 100644
index 0000000..0a37c22
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
@@ -0,0 +1,24 @@
+package com.example.three_lines.presentation.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.example.three_lines.data.Note
+import com.example.three_lines.domain.AddNoteUseCase
+import com.example.three_lines.domain.GetNotesUseCase
+
+class NotesListViewModel(
+    private val getNotesUseCase: GetNotesUseCase = GetNotesUseCase(),
+    private val addNoteUseCase: AddNoteUseCase = AddNoteUseCase()
+): ViewModel() {
+
+    private val _notesListLiveData = MutableLiveData<List<Note>>()
+    val notesListLiveData : LiveData<List<Note>> = _notesListLiveData
+    fun onAddClicked(text: String){
+        addNoteUseCase.execute(text)
+        getNotes()
+    }
+    fun getNotes(){
+      _notesListLiveData.value =  getNotesUseCase.execute().toList()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_quick_note.xml b/app/src/main/res/drawable/ic_add_quick_note.xml
new file mode 100644
index 0000000..853093e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_quick_note.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M18,13H13V18C13,18.55 12.55,19 12,19C11.45,19 11,18.55 11,18V13H6C5.45,13 5,12.55 5,12C5,11.45 5.45,11 6,11H11V6C11,5.45 11.45,5 12,5C12.55,5 13,5.45 13,6V11H18C18.55,11 19,11.45 19,12C19,12.55 18.55,13 18,13Z"
+        android:fillColor="#000000"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/fragment_note_list.xml b/app/src/main/res/layout/fragment_note_list.xml
new file mode 100644
index 0000000..7c85d6a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_note_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            app:title="@string/notes_list_title"
+            app:titleCentered="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerview"
+        android:padding="8dp"
+        android:clipToPadding="false"
+        app:layout_behavior="com.google.android.material.search.SearchBar$ScrollingViewBehavior"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_add_quick_note"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|bottom"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
new file mode 100644
index 0000000..7e9d695
--- /dev/null
+++ b/app/src/main/res/layout/item_note.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="12dp"
+    android:layout_margin="8dp">
+    <TextView
+        android:id="@+id/textViewText"
+        android:layout_width="match_parent"
+        android:layout_margin="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        android:text="rand"
+        android:layout_height="match_parent"/>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index b6fbb0b..defc8e5 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -3,32 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/firstFragment">
+    app:startDestination="@id/noteListFragment">
 
-    <fragment
-        android:id="@+id/firstFragment"
-        tools:layout="@layout/fragment_first"
-        android:name="com.example.three_lines.fragment1.FirstFragment"
-        android:label="FirstFragment" >
-        <action
-            android:id="@+id/action_firstFragment_to_secondFragment13"
-            app:destination="@id/secondFragment" >
-            <argument
-                android:name="text"
-                android:defaultValue="hh" />
-        </action>
-    </fragment>
-    <fragment
-        android:id="@+id/secondFragment"
-        android:name="com.example.three_lines.fragment2.SecondFragment"
-        android:label="SecondFragment"
-        tools:layout="@layout/second_fragment"
-        >
-        <argument
-            android:name="text"
-            app:argType="string"
-            app:nullable="true"
-            android:defaultValue="test" />
-    </fragment>
 
+    <fragment
+        android:id="@+id/noteListFragment"
+        android:name="com.example.three_lines.presentation.list.NoteListFragment"
+        android:label="NoteListFragment"
+        tools:layout="@layout/fragment_note_list"/>
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5b164c..f40e208 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Three_lines</string>
+    <string name="notes_list_title">QuickNote</string>
 </resources>
\ No newline at end of file

From 08d6ce04356338f8c8743be4b798eb0ef5a50e93 Mon Sep 17 00:00:00 2001
From: huntams <dissirina2904@gmail.com>
Date: Sun, 23 Apr 2023 17:14:40 +0700
Subject: [PATCH 4/5] test branch

---
 .../three_lines/data/NotesDataSource.kt       |  3 ++
 .../data/repository/NoteRepositoryImpl.kt     |  4 ++
 .../data/repository/NotesRepository.kt        |  1 +
 .../three_lines/domain/RemoveNotesUseCase.kt  |  4 ++
 .../fragment_add_note/AddNoteFragment.kt      |  7 ++++
 .../presentation/list/NoteListFragment.kt     |  3 +-
 .../second_activity/SecondActivity.kt         |  1 +
 app/src/main/res/drawable/ic_add_image.xml    | 13 ++++++
 app/src/main/res/drawable/ic_send.xml         | 13 ++++++
 app/src/main/res/layout/fragment_add_note.xml | 40 +++++++++++++++++++
 app/src/main/res/navigation/nav_graph.xml     | 10 ++++-
 app/src/main/res/values/strings.xml           |  1 +
 12 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
 create mode 100644 app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_add_image.xml
 create mode 100644 app/src/main/res/drawable/ic_send.xml
 create mode 100644 app/src/main/res/layout/fragment_add_note.xml

diff --git a/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
index f3da69d..ce2891d 100644
--- a/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
+++ b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
@@ -5,4 +5,7 @@ object NotesDataSource {
     fun addNote(text : String){
         notesList.add(Note(text = text))
     }
+    fun removeNote(text : String){
+        notesList.remove(Note(text = text))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
index 8b66210..838ffea 100644
--- a/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
+++ b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
@@ -13,4 +13,8 @@ class NoteRepositoryImpl(
     override fun addNote(text: String) {
         notesDataSource.addNote(text)
     }
+
+    override fun removeNotes() {
+        TODO("Not yet implemented")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
index 9adc262..b62336e 100644
--- a/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
+++ b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
@@ -5,4 +5,5 @@ import com.example.three_lines.data.Note
 interface NotesRepository {
     fun getNotes() : List<Note>
     fun addNote(text: String)
+    fun removeNotes() : Unit
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt b/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
new file mode 100644
index 0000000..a8852ec
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
@@ -0,0 +1,4 @@
+package com.example.three_lines.domain
+
+class RemoveNotesUseCase {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt b/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
new file mode 100644
index 0000000..142cec6
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
@@ -0,0 +1,7 @@
+package com.example.three_lines.presentation.fragment_add_note
+
+import androidx.fragment.app.Fragment
+import com.example.three_lines.R
+
+class AddNoteFragment: Fragment(R.layout.fragment_add_note)  {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
index af61f45..a2564d4 100644
--- a/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
@@ -42,7 +42,8 @@ class NoteListFragment : Fragment(R.layout.fragment_note_list) {
                 }
             }
             floatingActionButton.setOnClickListener {
-                viewModel.onAddClicked(MOCK_TEXT)
+
+                //viewModel.onAddClicked(MOCK_TEXT)
             }
             viewModel.notesListLiveData.observe(viewLifecycleOwner) {
                 listAdapter.submitList(it)
diff --git a/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt b/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
index b6c1ede..0b0cb57 100644
--- a/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
+++ b/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
@@ -15,6 +15,7 @@ class SecondActivity : AppCompatActivity() {
             putExtra(ARG_TEXT_KEY,text)
         }
     }
+
     private lateinit var binding: ActivitySecondBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/res/drawable/ic_add_image.xml b/app/src/main/res/drawable/ic_add_image.xml
new file mode 100644
index 0000000..1ca4425
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_image.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <group>
+    <clip-path
+        android:pathData="M0,0h18v18h-18z"/>
+    <path
+        android:pathData="M3.75,15.75C3.338,15.75 2.984,15.603 2.69,15.31C2.397,15.016 2.25,14.663 2.25,14.25V3.75C2.25,3.338 2.397,2.984 2.69,2.69C2.984,2.397 3.338,2.25 3.75,2.25H9.75C9.962,2.25 10.141,2.322 10.285,2.465C10.428,2.609 10.5,2.787 10.5,3C10.5,3.213 10.428,3.391 10.285,3.534C10.141,3.678 9.962,3.75 9.75,3.75H3.75V14.25H14.25V8.25C14.25,8.038 14.322,7.859 14.466,7.715C14.609,7.572 14.788,7.5 15,7.5C15.212,7.5 15.391,7.572 15.534,7.715C15.678,7.859 15.75,8.038 15.75,8.25V14.25C15.75,14.663 15.603,15.016 15.31,15.31C15.016,15.603 14.663,15.75 14.25,15.75H3.75ZM13.5,6.75C13.288,6.75 13.109,6.678 12.966,6.534C12.822,6.391 12.75,6.213 12.75,6V5.25H12C11.788,5.25 11.609,5.178 11.466,5.035C11.322,4.891 11.25,4.713 11.25,4.5C11.25,4.287 11.322,4.109 11.466,3.965C11.609,3.822 11.788,3.75 12,3.75H12.75V3C12.75,2.787 12.822,2.609 12.966,2.465C13.109,2.322 13.288,2.25 13.5,2.25C13.712,2.25 13.891,2.322 14.034,2.465C14.178,2.609 14.25,2.787 14.25,3V3.75H15C15.212,3.75 15.391,3.822 15.534,3.965C15.678,4.109 15.75,4.287 15.75,4.5C15.75,4.713 15.678,4.891 15.534,5.035C15.391,5.178 15.212,5.25 15,5.25H14.25V6C14.25,6.213 14.178,6.391 14.034,6.534C13.891,6.678 13.712,6.75 13.5,6.75ZM5.25,12.75H12.75C12.9,12.75 13.012,12.681 13.087,12.544C13.163,12.406 13.15,12.275 13.05,12.15L10.988,9.394C10.913,9.294 10.813,9.244 10.688,9.244C10.563,9.244 10.462,9.294 10.387,9.394L8.438,12L7.05,10.144C6.975,10.044 6.875,9.994 6.75,9.994C6.625,9.994 6.525,10.044 6.45,10.144L4.95,12.15C4.85,12.275 4.838,12.406 4.912,12.544C4.988,12.681 5.1,12.75 5.25,12.75ZM3.75,8.25V14.25V3.75V6C3.75,6.213 3.75,6.391 3.75,6.534C3.75,6.678 3.75,6.75 3.75,6.75V7.5C3.75,7.713 3.75,7.891 3.75,8.034C3.75,8.178 3.75,8.25 3.75,8.25Z"
+        android:fillColor="#CFBCFF"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
new file mode 100644
index 0000000..906314c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M3.4,20.4L20.85,12.92C21.66,12.57 21.66,11.43 20.85,11.08L3.4,3.6C2.74,3.31 2.01,3.8 2.01,4.51L2,9.12C2,9.62 2.37,10.05 2.87,10.11L17,12L2.87,13.88C2.37,13.95 2,14.38 2,14.88L2.01,19.49C2.01,20.2 2.74,20.69 3.4,20.4Z"
+        android:fillColor="#000000"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/fragment_add_note.xml b/app/src/main/res/layout/fragment_add_note.xml
new file mode 100644
index 0000000..c27de7a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_add_note.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/notes_list_title"
+            app:titleCentered="true" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <EditText
+        android:id="@+id/editTextNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="gsdag" />
+
+    <Button
+        android:id="@+id/imageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/ic_add_image"
+        android:hint="@string/add_image" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_send" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index defc8e5..5894d12 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -10,5 +10,13 @@
         android:id="@+id/noteListFragment"
         android:name="com.example.three_lines.presentation.list.NoteListFragment"
         android:label="NoteListFragment"
-        tools:layout="@layout/fragment_note_list"/>
+        tools:layout="@layout/fragment_note_list">
+        <action
+            android:id="@+id/action_noteListFragment_to_addNoteFragment"
+            app:destination="@id/addNoteFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/addNoteFragment"
+        android:name="com.example.three_lines.presentation.fragment_add_note.AddNoteFragment"
+        android:label="AddNoteFragment" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f40e208..522c2c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">Three_lines</string>
     <string name="notes_list_title">QuickNote</string>
+    <string name="add_image">Add image…</string>
 </resources>
\ No newline at end of file

From 591c7b6fee4f376b7173a1144f49ce42df1e3575 Mon Sep 17 00:00:00 2001
From: huntams <dissirina2904@gmail.com>
Date: Fri, 19 May 2023 02:02:16 +0700
Subject: [PATCH 5/5] refactor code, work done

---
 .idea/misc.xml                                |  2 +-
 app/src/main/AndroidManifest.xml              |  4 +-
 .../example/three_lines/DataListAdapter.kt    | 51 ------------------
 .../java/com/example/three_lines/DataModel.kt |  9 ----
 .../com/example/three_lines/ViewContact.kt    | 54 -------------------
 .../three_lines/data/NotesDataSource.kt       |  4 +-
 .../data/repository/NoteRepositoryImpl.kt     |  4 +-
 .../data/repository/NotesRepository.kt        |  4 +-
 .../three_lines/domain/DeleteNoteUseCase.kt   | 12 +++++
 .../three_lines/domain/RemoveNotesUseCase.kt  |  4 --
 .../three_lines/fragment1/FirstFragment.kt    | 26 ---------
 .../three_lines/fragment2/SecondFragment.kt   | 21 --------
 .../three_lines/presentation/MainActivity.kt  | 10 ++--
 .../fragment_add_note/AddNoteFragment.kt      | 26 ++++++++-
 .../presentation/list/NoteListAdapter.kt      | 14 +++--
 .../presentation/list/NoteListFragment.kt     | 25 ++++-----
 .../presentation/list/NotesListViewModel.kt   | 11 +++-
 .../second_activity/SecondActivity.kt         | 29 ----------
 app/src/main/res/drawable/ic_back_24.xml      |  5 ++
 app/src/main/res/layout/activity_main.xml     |  2 -
 app/src/main/res/layout/activity_second.xml   | 12 -----
 app/src/main/res/layout/fragment_add_note.xml | 34 +++++++-----
 app/src/main/res/layout/fragment_first.xml    | 19 -------
 .../main/res/layout/fragment_note_list.xml    | 43 +++++++++------
 app/src/main/res/layout/item_note.xml         | 11 ++--
 app/src/main/res/layout/second_fragment.xml   | 15 ------
 app/src/main/res/layout/view_contact.xml      | 47 ----------------
 app/src/main/res/menu/search.xml              |  4 ++
 28 files changed, 141 insertions(+), 361 deletions(-)
 delete mode 100644 app/src/main/java/com/example/three_lines/DataListAdapter.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/DataModel.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/ViewContact.kt
 create mode 100644 app/src/main/java/com/example/three_lines/domain/DeleteNoteUseCase.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
 delete mode 100644 app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
 create mode 100644 app/src/main/res/drawable/ic_back_24.xml
 delete mode 100644 app/src/main/res/layout/activity_second.xml
 delete mode 100644 app/src/main/res/layout/fragment_first.xml
 delete mode 100644 app/src/main/res/layout/second_fragment.xml
 delete mode 100644 app/src/main/res/layout/view_contact.xml
 create mode 100644 app/src/main/res/menu/search.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..704c883 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="Android Studio default JDK" 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 ed7b7e9..29e1a9f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Three_lines"
+        android:theme="@style/Theme.MaterialComponents.Light.NoActionBar"
         tools:targetApi="31">
         <activity
             android:name=".presentation.MainActivity"
@@ -20,8 +20,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".second_activity.SecondActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/DataListAdapter.kt b/app/src/main/java/com/example/three_lines/DataListAdapter.kt
deleted file mode 100644
index c36b229..0000000
--- a/app/src/main/java/com/example/three_lines/DataListAdapter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.example.three_lines
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.example.three_lines.databinding.ActivityMainBinding
-import com.example.three_lines.databinding.ViewContactBinding
-
-class DataListAdapter : ListAdapter<DataModel, DataListAdapter.DataViewHolder>(diffUtilCallback) {
-
-    private var onClick : ( DataModel)-> Unit = {}
-    fun setCallback(callback :(DataModel) -> Unit){
-        this.onClick = callback
-    }
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataViewHolder {
-        val binding = ViewContactBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return DataViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: DataViewHolder, position: Int) {
-        holder.bind(getItem(position))
-    }
-
-    inner class DataViewHolder(
-        private val binding: ViewContactBinding,
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: DataModel) {
-            with(binding) {
-                head.text = item.title
-                subhead.text = item.subtitle
-                root.setOnClickListener {
-                    onClick.invoke(item)
-                }
-            }
-
-        }
-    }
-}
-
-val diffUtilCallback = object : DiffUtil.ItemCallback<DataModel>() {
-
-    override fun areContentsTheSame(oldItem: DataModel, newItem: DataModel): Boolean {
-        return oldItem == newItem
-    }
-
-    override fun areItemsTheSame(oldItem: DataModel, newItem: DataModel): Boolean {
-        return oldItem.id == newItem.id
-    }
-}
diff --git a/app/src/main/java/com/example/three_lines/DataModel.kt b/app/src/main/java/com/example/three_lines/DataModel.kt
deleted file mode 100644
index 4eb6c7d..0000000
--- a/app/src/main/java/com/example/three_lines/DataModel.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.three_lines
-
-import java.util.UUID
-
-data class DataModel(
-    val title: String,
-    val subtitle: String,
-    val id : String = UUID.randomUUID().toString(),
-)
diff --git a/app/src/main/java/com/example/three_lines/ViewContact.kt b/app/src/main/java/com/example/three_lines/ViewContact.kt
deleted file mode 100644
index 1918979..0000000
--- a/app/src/main/java/com/example/three_lines/ViewContact.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.example.three_lines
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.annotation.DrawableRes
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
-import androidx.core.content.withStyledAttributes
-import com.example.three_lines.databinding.ViewContactBinding
-
-class ViewContact @JvmOverloads constructor(
-    context: Context,
-    attributeSet: AttributeSet? = null,
-    defAttrsSet: Int = 0
-) : ConstraintLayout(context, attributeSet, defAttrsSet) {
-    private lateinit var binding: ViewContactBinding
-
-    init {
-        binding = ViewContactBinding.inflate(
-            LayoutInflater.from(context),
-            this,
-            true
-        )
-        context.withStyledAttributes(
-            attributeSet,
-            R.styleable.ViewContact, defAttrsSet, 0
-        ) {
-            val title = getString(R.styleable.ViewContact_title)?.let {
-                title ->binding.head.text = title
-            }
-            val subtitle = getString(R.styleable.ViewContact_subtitle)?.let {
-                subtitle -> binding.subhead.text = subtitle
-            }
-            val image = getDrawable(R.styleable.ViewContact_image)?.let {
-                image -> binding.image.setImageDrawable(image)
-            }
-        }
-    }
-
-    fun setTitle(text: String) {
-        binding.head.text = text
-    }
-
-    fun setSubTitle(text: String) {
-        binding.subhead.text = text
-    }
-
-    fun setImage(@DrawableRes imagesRes: Int) {
-        binding.image.setImageDrawable(
-            ContextCompat.getDrawable(context, imagesRes)
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
index ce2891d..cd1f809 100644
--- a/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
+++ b/app/src/main/java/com/example/three_lines/data/NotesDataSource.kt
@@ -5,7 +5,7 @@ object NotesDataSource {
     fun addNote(text : String){
         notesList.add(Note(text = text))
     }
-    fun removeNote(text : String){
-        notesList.remove(Note(text = text))
+    fun deleteNote(note: Note){
+        notesList.remove(note)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
index 838ffea..0c9487d 100644
--- a/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
+++ b/app/src/main/java/com/example/three_lines/data/repository/NoteRepositoryImpl.kt
@@ -14,7 +14,7 @@ class NoteRepositoryImpl(
         notesDataSource.addNote(text)
     }
 
-    override fun removeNotes() {
-        TODO("Not yet implemented")
+    override fun deleteNote(note: Note) {
+        notesDataSource.deleteNote(note)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
index b62336e..ffa8025 100644
--- a/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
+++ b/app/src/main/java/com/example/three_lines/data/repository/NotesRepository.kt
@@ -3,7 +3,7 @@ package com.example.three_lines.data.repository
 import com.example.three_lines.data.Note
 
 interface NotesRepository {
-    fun getNotes() : List<Note>
+    fun getNotes(): List<Note>
     fun addNote(text: String)
-    fun removeNotes() : Unit
+    fun deleteNote(note: Note)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/domain/DeleteNoteUseCase.kt b/app/src/main/java/com/example/three_lines/domain/DeleteNoteUseCase.kt
new file mode 100644
index 0000000..4d176cf
--- /dev/null
+++ b/app/src/main/java/com/example/three_lines/domain/DeleteNoteUseCase.kt
@@ -0,0 +1,12 @@
+package com.example.three_lines.domain
+
+import com.example.three_lines.data.Note
+import com.example.three_lines.data.repository.NoteRepositoryImpl
+import com.example.three_lines.data.repository.NotesRepository
+class DeleteNoteUseCase(
+    private val notesRepository: NotesRepository = NoteRepositoryImpl()
+) {
+    fun execute(note: Note) {
+        notesRepository.deleteNote(note)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt b/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
deleted file mode 100644
index a8852ec..0000000
--- a/app/src/main/java/com/example/three_lines/domain/RemoveNotesUseCase.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.example.three_lines.domain
-
-class RemoveNotesUseCase {
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt b/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
deleted file mode 100644
index d6a7ac0..0000000
--- a/app/src/main/java/com/example/three_lines/fragment1/FirstFragment.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.three_lines.fragment1
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import by.kirich1409.viewbindingdelegate.viewBinding
-import com.example.three_lines.R
-import com.example.three_lines.databinding.FragmentFirstBinding
-
-class FirstFragment : Fragment(R.layout.fragment_first) {
-
-    private val binding by viewBinding(FragmentFirstBinding::bind)
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-
-        super.onViewCreated(view, savedInstanceState)
-        binding.button.setOnClickListener {
-            val text = binding.editText.text.toString()
-            findNavController().popBackStack()
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt b/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
deleted file mode 100644
index a118b2c..0000000
--- a/app/src/main/java/com/example/three_lines/fragment2/SecondFragment.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.three_lines.fragment2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.navArgs
-import by.kirich1409.viewbindingdelegate.viewBinding
-import com.example.three_lines.R
-import com.example.three_lines.databinding.SecondFragmentBinding
-import com.example.three_lines.fragment1.FirstFragment
-
-class SecondFragment : Fragment(R.layout.second_fragment) {
-    private val binding by viewBinding(SecondFragmentBinding:: bind)
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt b/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
index 6824fa5..faa3d71 100644
--- a/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/MainActivity.kt
@@ -1,19 +1,17 @@
 package com.example.three_lines.presentation
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Toast
+import by.kirich1409.viewbindingdelegate.viewBinding
+import com.example.three_lines.R
 import com.example.three_lines.databinding.ActivityMainBinding
-import com.example.three_lines.second_activity.SecondActivity
 
-class MainActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityMainBinding
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
+    private val binding by viewBinding(ActivityMainBinding::bind)
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
         }
 
diff --git a/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt b/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
index 142cec6..643f80b 100644
--- a/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/fragment_add_note/AddNoteFragment.kt
@@ -1,7 +1,31 @@
 package com.example.three_lines.presentation.fragment_add_note
 
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import by.kirich1409.viewbindingdelegate.viewBinding
 import com.example.three_lines.R
+import com.example.three_lines.databinding.FragmentAddNoteBinding
+import com.example.three_lines.presentation.list.NotesListViewModel
 
-class AddNoteFragment: Fragment(R.layout.fragment_add_note)  {
+class AddNoteFragment : Fragment(R.layout.fragment_add_note) {
+    private val viewModel by viewModels<NotesListViewModel>()
+    private val binding by viewBinding(FragmentAddNoteBinding::bind)
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(binding) {
+            toolbar.setNavigationOnClickListener {
+                findNavController().popBackStack()
+            }
+            floatingActionButton.setOnClickListener {
+                viewModel.onAddClicked(editTextNote.text.toString())
+                findNavController().popBackStack()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt b/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
index 69b631d..be9ad7c 100644
--- a/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NoteListAdapter.kt
@@ -1,23 +1,23 @@
 package com.example.three_lines.presentation.list
 
 import android.view.LayoutInflater
-import android.view.ScrollCaptureCallback
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.example.three_lines.DataModel
 import com.example.three_lines.data.Note
-import com.example.three_lines.databinding.FragmentNoteListBinding
 import com.example.three_lines.databinding.ItemNoteBinding
-import com.example.three_lines.databinding.ViewContactBinding
 
 class NoteListAdapter : ListAdapter<Note,NoteListAdapter.NoteViewHolder>(diffUtil)  {
     private var onNoteClick : (Note) -> Unit = {}
     fun setCallBack(callback: (Note)->Unit){
         this.onNoteClick = callback
     }
+    private var onNoteLongClick: (Note) -> Unit = {}
+
+    fun setLongCallBack(callback: (Note) -> Unit) {
+        this.onNoteLongClick = callback
+    }
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NoteViewHolder {
         val binding = ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return NoteViewHolder(binding)
@@ -34,6 +34,10 @@ class NoteListAdapter : ListAdapter<Note,NoteListAdapter.NoteViewHolder>(diffUti
             with(binding){
                 root.setOnClickListener { onNoteClick(item) }
                 textViewText.text = item.text
+                root.setOnLongClickListener {
+                    onNoteLongClick(item)
+                    true
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
index a2564d4..02d5018 100644
--- a/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NoteListFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import by.kirich1409.viewbindingdelegate.viewBinding
@@ -12,11 +13,7 @@ import com.example.three_lines.R
 import com.example.three_lines.databinding.FragmentNoteListBinding
 
 class NoteListFragment : Fragment(R.layout.fragment_note_list) {
-    companion object {
-        private const val MOCK_TEXT =
-            "Note text that resizes the card vertically to fit itself. It can be very long, but let’s settle on 180 characters as the limit"
 
-    }
 
     private val binding by viewBinding(FragmentNoteListBinding::bind)
     private val viewModel by viewModels<NotesListViewModel>()
@@ -25,25 +22,25 @@ class NoteListFragment : Fragment(R.layout.fragment_note_list) {
         super.onViewCreated(view, savedInstanceState)
         viewModel.getNotes()
         with(binding) {
-            /*
-            toolbar.setNavigationOnClickListener {
-                findNavController().popBackStack()
-            }
-
-             */
             recyclerview.apply {
 
 
                 layoutManager = StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
                 adapter = listAdapter.apply {
-                    setCallBack { note ->
-                        Toast.makeText(requireContext(), note.text, Toast.LENGTH_SHORT).show()
+                    setLongCallBack { note ->
+                        Toast.makeText(
+                            requireContext(),
+                            "Запись : \"" + note.text + "\" удалена",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        viewModel.onDeleteClicked(note)
                     }
                 }
             }
             floatingActionButton.setOnClickListener {
-
-                //viewModel.onAddClicked(MOCK_TEXT)
+                findNavController().navigate(
+                    NoteListFragmentDirections.actionNoteListFragmentToAddNoteFragment()
+                )
             }
             viewModel.notesListLiveData.observe(viewLifecycleOwner) {
                 listAdapter.submitList(it)
diff --git a/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt b/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
index 0a37c22..8492994 100644
--- a/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
+++ b/app/src/main/java/com/example/three_lines/presentation/list/NotesListViewModel.kt
@@ -3,13 +3,17 @@ package com.example.three_lines.presentation.list
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.example.three_lines.data.Note
 import com.example.three_lines.domain.AddNoteUseCase
+import com.example.three_lines.domain.DeleteNoteUseCase
 import com.example.three_lines.domain.GetNotesUseCase
+import kotlinx.coroutines.launch
 
 class NotesListViewModel(
     private val getNotesUseCase: GetNotesUseCase = GetNotesUseCase(),
-    private val addNoteUseCase: AddNoteUseCase = AddNoteUseCase()
+    private val addNoteUseCase: AddNoteUseCase = AddNoteUseCase(),
+    private val deleteNoteUseCase: DeleteNoteUseCase = DeleteNoteUseCase(),
 ): ViewModel() {
 
     private val _notesListLiveData = MutableLiveData<List<Note>>()
@@ -21,4 +25,9 @@ class NotesListViewModel(
     fun getNotes(){
       _notesListLiveData.value =  getNotesUseCase.execute().toList()
     }
+
+    fun onDeleteClicked(note: Note) {
+            deleteNoteUseCase.execute(note)
+            getNotes()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt b/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
deleted file mode 100644
index 0b0cb57..0000000
--- a/app/src/main/java/com/example/three_lines/second_activity/SecondActivity.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.example.three_lines.second_activity
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.example.three_lines.databinding.ActivitySecondBinding
-
-class SecondActivity : AppCompatActivity() {
-
-    companion object{
-        private const val ARG_TEXT_KEY = "ARG_TEXT_KEY"
-
-        fun createIntent(context : Context,text: String) = Intent(context,SecondActivity::class.java).apply {
-            putExtra(ARG_TEXT_KEY,text)
-        }
-    }
-
-    private lateinit var binding: ActivitySecondBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivitySecondBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val text = intent.extras?.getString(ARG_TEXT_KEY)
-        binding.textView.text = text
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back_24.xml b/app/src/main/res/drawable/ic_back_24.xml
new file mode 100644
index 0000000..8452791
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d1772e7..48ce58f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,13 +2,11 @@
 
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
deleted file mode 100644
index 85d078f..0000000
--- a/app/src/main/res/layout/activity_second.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:id="@+id/textView"
-        android:text="rand"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_note.xml b/app/src/main/res/layout/fragment_add_note.xml
index c27de7a..0d0a607 100644
--- a/app/src/main/res/layout/fragment_add_note.xml
+++ b/app/src/main/res/layout/fragment_add_note.xml
@@ -1,40 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/QuickNoteAppBar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:navigationIcon="@drawable/ic_back_24"
             app:title="@string/notes_list_title"
             app:titleCentered="true" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <EditText
         android:id="@+id/editTextNote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:hint="gsdag" />
-
-    <Button
-        android:id="@+id/imageButton"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_add_image"
-        android:hint="@string/add_image" />
+        android:layout_margin="16dp"
+        android:maxLength="180"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/QuickNoteAppBar" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_send" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_send"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
deleted file mode 100644
index cea7234..0000000
--- a/app/src/main/res/layout/fragment_first.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingHorizontal="16dp">
-    <EditText
-        android:id="@+id/editText"
-        android:hint="Text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-    <Button
-        android:id="@+id/button"
-        android:hint="press"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_note_list.xml b/app/src/main/res/layout/fragment_note_list.xml
index 7c85d6a..26dfdf0 100644
--- a/app/src/main/res/layout/fragment_note_list.xml
+++ b/app/src/main/res/layout/fragment_note_list.xml
@@ -1,31 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            app:title="@string/notes_list_title"
-            app:titleCentered="true"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:menu="@menu/search"
+            app:title="@string/notes_list_title"
+            app:titleCentered="true" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerview"
-        android:padding="8dp"
-        android:clipToPadding="false"
-        app:layout_behavior="com.google.android.material.search.SearchBar$ScrollingViewBehavior"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollV"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:padding="8dp"
+            app:layout_behavior="com.google.android.material.search.SearchBar$ScrollingViewBehavior" />
+    </androidx.core.widget.NestedScrollView>
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
-        android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_add_quick_note"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"/>
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_add_quick_note" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 7e9d695..cc40737 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="12dp"
-    android:layout_margin="8dp">
+    android:layout_margin="8dp"
+    app:cardCornerRadius="12dp">
+
     <TextView
         android:id="@+id/textViewText"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_margin="16dp"
-        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-        android:text="rand"
-        android:layout_height="match_parent"/>
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/second_fragment.xml b/app/src/main/res/layout/second_fragment.xml
deleted file mode 100644
index b584c28..0000000
--- a/app/src/main/res/layout/second_fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="MissingDefaultResource">
-    <TextView
-        android:id="@+id/textViewText"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textSize="36dp"
-        android:text="RAND"
-        android:gravity="center"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_contact.xml b/app/src/main/res/layout/view_contact.xml
deleted file mode 100644
index 6d6d9fc..0000000
--- a/app/src/main/res/layout/view_contact.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingVertical="12dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="24dp"
-    android:background="?attr/selectableItemBackground"
-    >
-    <com.google.android.material.imageview.ShapeableImageView
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:id="@+id/image"
-        app:shapeAppearance="@style/RoundedImage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-    </com.google.android.material.imageview.ShapeableImageView>
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toEndOf="@+id/image"
-        android:layout_marginStart="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="Headline"
-        android:id="@+id/head"
-        android:ellipsize="end"
-        android:maxLines="1"
-        >
-    </TextView>
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toEndOf="@+id/image"
-        app:layout_constraintTop_toBottomOf="@+id/head"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
-        android:text="Headline2"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:id="@+id/subhead"
-        />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
new file mode 100644
index 0000000..fe187c0
--- /dev/null
+++ b/app/src/main/res/menu/search.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+</menu>
\ No newline at end of file