diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2bb2b12..9076ad5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/drawable-v24/txt_color_24.xml" value="0.168" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/drawable/bookmark.xml" value="0.203" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/drawable/bookmark_blue.xml" value="0.203" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/drawable/bookmark_grren.xml" value="0.203" />
@@ -15,6 +16,7 @@
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/drawable/round_button.xml" value="0.194" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_login.xml" value="0.25" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_main.xml" value="0.24010416666666667" />
+        <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_open_image.xml" value="0.25416666666666665" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_signup.xml" value="0.25416666666666665" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_text_note.xml" value="0.25416666666666665" />
         <entry key="..\:/Users/DC/AndroidStudioProjects/eNotes/app/src/main/res/layout/activity_view_notes.xml" value="0.25416666666666665" />
diff --git a/app/build.gradle b/app/build.gradle
index 55700e4..fcbbacc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,11 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
 }
 
+
 android {
     compileSdk 32
 
@@ -22,6 +25,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        viewBinding = true
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -52,4 +58,11 @@ dependencies {
     implementation 'com.github.Miihir79:DrawingCanvas:1.1.2'
     implementation 'com.github.DonghanX:Draw:v1.0.3'
 
+    // dependencies for Api integration | Retrofit 2
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2e3e5ab..aecb0f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -19,6 +20,10 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ENotes"
         tools:targetApi="31">
+        <activity
+            android:name=".OpenImage"
+            android:exported="false" />
+
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/map_key" />
@@ -44,15 +49,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <receiver android:name=".BroadcastService"
+
+        <receiver
+            android:name=".BroadcastService"
             android:exported="true">
             <intent-filter>
-                <action android:name="com.myaction.com">
-                </action>
+                <action android:name="com.myaction.com"></action>
             </intent-filter>
-
         </receiver>
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/BroadcastService.kt b/app/src/main/java/com/example/enotes/BroadcastService.kt
index 831ec99..60f00f3 100644
--- a/app/src/main/java/com/example/enotes/BroadcastService.kt
+++ b/app/src/main/java/com/example/enotes/BroadcastService.kt
@@ -3,14 +3,14 @@ package com.example.enotes
 import android.R
 import android.app.NotificationChannel
 import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
-
-import android.os.Build
 import androidx.core.app.NotificationManagerCompat
 
 
@@ -29,11 +29,21 @@ class BroadcastService : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
 
-        var time= intent.getStringExtra("time")
+        val time= intent.getStringExtra("time")
         Toast.makeText(context, "Successful", Toast.LENGTH_SHORT).show()
+        val title= intent.getStringExtra("title")
+
 
         createNotificationChannel(context)
-        notifyNotification(context,time)
+        val notificationIntent = Intent(context, MainActivity::class.java)
+        notificationIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+
+        val pendingIntent = PendingIntent.getActivity(
+            context, 0, notificationIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
+
+        notifyNotification(context,time, title,pendingIntent)
 
 
         if (time != null) {
@@ -54,12 +64,18 @@ class BroadcastService : BroadcastReceiver() {
         }
     }
 
-    private fun notifyNotification(context: Context, time: String?) {
+    private fun notifyNotification(
+        context: Context,
+        time: String?,
+        title: String?,
+        pendingIntent: PendingIntent
+    ) {
         with(NotificationManagerCompat.from(context)) {
             val build = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(time)
-                .setContentText("Alarm.")
+                .setContentText(title)
                 .setSmallIcon(R.drawable.ic_lock_idle_alarm)
+                .setContentIntent(pendingIntent)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
 
             notify(NOTIFICATION_ID, build.build())
diff --git a/app/src/main/java/com/example/enotes/Login.kt b/app/src/main/java/com/example/enotes/Login.kt
index 915abee..3e28dab 100644
--- a/app/src/main/java/com/example/enotes/Login.kt
+++ b/app/src/main/java/com/example/enotes/Login.kt
@@ -2,34 +2,72 @@ package com.example.enotes
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.example.enotes.api.ApiClientSignupLogin
+import com.example.enotes.models.request.LoginRequest
+import com.example.enotes.models.response.LoginResponse
+import com.example.enotes.models.response.RegisterResponse
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class Login : AppCompatActivity() {
 
-       override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
 
         val email = findViewById<EditText>(R.id.email)
         val password = findViewById<EditText>(R.id.password)
         val login_btn = findViewById<Button>(R.id.login_btn)
-        val forget_pswrd = findViewById<TextView>(R.id.forget_password)
-        val dont_have_accnt = findViewById<TextView>( R.id.signup)
+        val dont_have_accnt = findViewById<TextView>(R.id.signup)
 
         login_btn.setOnClickListener {
+
+            val et_email = email.text.toString()
+            val et_pass = password.text.toString()
+
+            if (et_email.isNotEmpty() && et_pass.isNotEmpty()) {
+                loginUser(et_email, et_pass)
+            }
+        }
+
+        dont_have_accnt.setOnClickListener {
             val intent = Intent(this@Login, MainActivity::class.java)
             startActivity(intent)
             finish()
         }
+    }
+
+    private fun loginUser(email: String, password: String) {
+
+        val loginRequest = LoginRequest(email, password)
+        val apiCall = ApiClientSignupLogin.getApiService().loninUser(loginRequest)
+        apiCall.enqueue(object : Callback<LoginResponse> {
+            override fun onResponse(
+                call: Call<LoginResponse>,
+                response: Response<LoginResponse>
+            ) {
+                if (response.isSuccessful) {
+                    Toast.makeText(applicationContext, "this is toast message", Toast.LENGTH_LONG)
+                        .show()
+            val intent = Intent(this@Login, MainActivity::class.java)
+            startActivity(intent)
+            finish()
+                }
+            }
 
-        dont_have_accnt.setOnClickListener{
-                val intent = Intent(this@Login, MainActivity::class.java)
-                startActivity(intent)
-                finish()
+            override fun onFailure(call: Call<LoginResponse>, t: Throwable) {
+                Toast.makeText(applicationContext, "" + t.localizedMessage, Toast.LENGTH_LONG)
+                    .show()
+                Log.e("abc", "" + t.localizedMessage)
             }
+        })
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/MainActivity.kt b/app/src/main/java/com/example/enotes/MainActivity.kt
index 9653f51..221bcff 100644
--- a/app/src/main/java/com/example/enotes/MainActivity.kt
+++ b/app/src/main/java/com/example/enotes/MainActivity.kt
@@ -18,6 +18,7 @@ import com.example.enotes.databasehelper.DbHelper
 import com.example.enotes.models.create_note
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationView
+import kotlinx.android.synthetic.main.activity_main.*
 
 
 class MainActivity : AppCompatActivity() {
@@ -26,12 +27,8 @@ class MainActivity : AppCompatActivity() {
     lateinit var adapter: All_notes_adapter
     lateinit var notesList: ArrayList<create_note>
 
-
     fun getAllNotesFromDatabase() {
         val db = DbHelper(this)
-        val show_notes = findViewById<RecyclerView>(R.id.show_notes)
-        show_notes.layoutManager= GridLayoutManager(this,2)
-
         notesList = ArrayList()
         notesList.addAll(db.viewnote())
         adapter = All_notes_adapter(notesList, this)
@@ -39,25 +36,14 @@ class MainActivity : AppCompatActivity() {
 
     }
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        val db = DbHelper(this)
-        val notesList : ArrayList<create_note> = ArrayList()
-
-        notesList.addAll(db.viewnote())
 
+        show_notes.layoutManager = GridLayoutManager(this, 2)
 
-//        val show_notes = findViewById<RecyclerView>(R.id.show_notes)
-//        val adapter = All_notes_adapter(notesList,this)
-//        show_notes.adapter = adapter
-//        show_notes.layoutManager= GridLayoutManager(this,2)
-//        adapter.notifyDataSetChanged()
-
-
-
-        val add_notes = findViewById<FloatingActionButton>(R.id.add_notes)
-        add_notes.setOnClickListener{
+        add_notes.setOnClickListener {
 
             val intent = Intent(this, Text_note::class.java)
             startActivity(intent)
@@ -65,39 +51,49 @@ class MainActivity : AppCompatActivity() {
         }
 
 
-
-
-        val dehaze = findViewById<ImageView>(R.id.dehaze)
-
-        val drawerlayout = findViewById<DrawerLayout>(R.id.my_drawer_layout)
-        val navView = findViewById<NavigationView>(R.id.navview)
-
         dehaze.setOnClickListener {
-            drawerlayout.openDrawer(GravityCompat.START)
+            my_drawer_layout.openDrawer(GravityCompat.START)
         }
 
 
-        toggle= ActionBarDrawerToggle(this,drawerlayout,R.string.open,R.string.close)
+        toggle = ActionBarDrawerToggle(this, my_drawer_layout, R.string.open, R.string.close)
 
-        drawerlayout.addDrawerListener(toggle)
+        my_drawer_layout.addDrawerListener(toggle)
         toggle.syncState()
 
+        navview.itemIconTintList= null
+
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        navView.setNavigationItemSelectedListener {
-            when(it.itemId){
+        navview.setNavigationItemSelectedListener {
+            when (it.itemId) {
                 R.id.nav_allnotes ->
-                    Toast.makeText(applicationContext,"all notes",Toast.LENGTH_SHORT).show()
-
-
+                    Toast.makeText(applicationContext, "all notes", Toast.LENGTH_SHORT).show()
             }
-            true
-            when(it.itemId){
-                R.id.nav_reminders ->
-                    Toast.makeText(applicationContext,"all reminders",Toast.LENGTH_SHORT).show()
-
-
+            when (it.itemId) {
+                R.id.nav_travel ->
+                    Toast.makeText(applicationContext, "all travels", Toast.LENGTH_SHORT).show()
+             }
+            when (it.itemId) {
+                R.id.nav_untag ->
+                    Toast.makeText(applicationContext, "all untags", Toast.LENGTH_SHORT).show()
+             }
+            when (it.itemId) {
+            R.id.nav_life ->
+                Toast.makeText(applicationContext, "all lifes", Toast.LENGTH_SHORT).show()
+            }
+            when (it.itemId) {
+                R.id.nav_birthdays ->
+                    Toast.makeText(applicationContext, "all birthdays", Toast.LENGTH_SHORT).show()
             }
+            when (it.itemId) {
+            R.id.nav_peronal ->
+                Toast.makeText(applicationContext, "all personals", Toast.LENGTH_SHORT).show()
+        }
+                when (it.itemId) {
+                    R.id.nav_work ->
+                        Toast.makeText(applicationContext, "all works", Toast.LENGTH_SHORT).show()
+                }
             true
         }
 
@@ -105,14 +101,16 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (toggle.onOptionsItemSelected(item)){
+        if (toggle.onOptionsItemSelected(item)) {
             return true
         }
         return super.onOptionsItemSelected(item)
     }
+
     override fun onResume() {
         super.onResume()
 
         getAllNotesFromDatabase()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/OpenImage.kt b/app/src/main/java/com/example/enotes/OpenImage.kt
new file mode 100644
index 0000000..d37f000
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/OpenImage.kt
@@ -0,0 +1,34 @@
+package com.example.enotes
+
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Bundle
+import android.util.Base64
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_open_image.*
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+
+
+class OpenImage : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_open_image)
+
+        val img_uri = intent.extras!!.getString("ImageUri")
+        val uri: Uri= Uri.parse(img_uri)
+
+//
+//        val decodedString: ByteArray = Base64.decode(img_uri, Base64.NO_WRAP)
+//        val input: InputStream = ByteArrayInputStream(decodedString)
+//        val ext_pic = BitmapFactory.decodeStream(input)
+        imageview.setImageURI(uri)
+
+        Log.e("myuri", uri.toString())
+        go_back.setOnClickListener {
+            finish()
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/Signup.kt b/app/src/main/java/com/example/enotes/Signup.kt
index 4cdf5c9..16d240b 100644
--- a/app/src/main/java/com/example/enotes/Signup.kt
+++ b/app/src/main/java/com/example/enotes/Signup.kt
@@ -2,10 +2,19 @@ package com.example.enotes
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.example.designstuff.api.ApiClient
+import com.example.enotes.api.ApiClientSignupLogin
+import com.example.enotes.models.request.RegisterRequest
+import com.example.enotes.models.response.RegisterResponse
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class Signup : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -13,16 +22,24 @@ class Signup : AppCompatActivity() {
         setContentView(R.layout.activity_signup)
 
        val full_name = findViewById<EditText>(R.id.full_name)
+       val email = findViewById<EditText>(R.id.email_address)
        val paswrd = findViewById<EditText>(R.id.password_signup)
       val  confirm = findViewById<EditText>(R.id.password_confirm)
       val  signup_btn = findViewById<Button>(R.id.create)
       val  login = findViewById<TextView>(R.id.login)
 
 
+
         signup_btn.setOnClickListener {
-            val intent = Intent(this, MainActivity::class.java)
-            startActivity(intent)
-            finish()
+
+              val userEmail = email.text.toString()
+            val password = paswrd.text.toString()
+            val name= full_name.text.toString()
+            val confirm_pass= confirm.text.toString()
+
+
+            registerUser(name,userEmail, password)
+
         }
 
         login.setOnClickListener {
@@ -32,5 +49,32 @@ class Signup : AppCompatActivity() {
         }
 
     }
+
+    private fun registerUser(name: String, email: String, password: String) {
+        val registerRequest = RegisterRequest(name,email,password)
+        val apiCall = ApiClientSignupLogin.getApiService().registerUser(registerRequest)
+        apiCall.enqueue(object : Callback<RegisterResponse> {
+            override fun onResponse(
+                call: Call<RegisterResponse>,
+                response: Response<RegisterResponse>
+            ) {
+                if (response.isSuccessful){
+                    Toast.makeText(applicationContext,"this is toast message", Toast.LENGTH_LONG).show()
+
+                    val intent = Intent(this@Signup, MainActivity::class.java)
+            startActivity(intent)
+            finish()
+
+                }
+            }
+
+            override fun onFailure(call: Call<RegisterResponse>, t: Throwable) {
+                Toast.makeText(applicationContext,""+t.localizedMessage, Toast.LENGTH_LONG).show()
+                Log.e("abc",""+t.localizedMessage)
+            }
+
+
+        })
+    }
 }
 
diff --git a/app/src/main/java/com/example/enotes/Text_note.kt b/app/src/main/java/com/example/enotes/Text_note.kt
index d8aacce..cd3c26c 100644
--- a/app/src/main/java/com/example/enotes/Text_note.kt
+++ b/app/src/main/java/com/example/enotes/Text_note.kt
@@ -1,24 +1,28 @@
 package com.example.enotes
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.AlarmManager
 import android.app.DatePickerDialog
 import android.app.PendingIntent
 import android.app.TimePickerDialog
+import android.content.ContentValues
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.location.Address
 import android.location.Geocoder
 import android.location.Location
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.provider.OpenableColumns
-import android.util.Base64
+import android.os.Environment.DIRECTORY_DCIM
+import android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+import android.provider.MediaStore.MediaColumns.*
 import android.util.Log
+import android.view.View
 import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
@@ -29,18 +33,30 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.example.designstuff.api.ApiService
 import com.example.enotes.adapter.AdapterFile_attach
 import com.example.enotes.adapter.Adapter_img_attach
 import com.example.enotes.databasehelper.DbHelper
+import com.example.enotes.models.ImageModel
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.maps.model.LatLng
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.madrapps.pikolo.ColorPicker
 import com.madrapps.pikolo.listeners.SimpleColorSelectionListener
 import com.redhoodhan.draw.DrawView
-import java.io.ByteArrayOutputStream
+import kotlinx.android.synthetic.main.activity_text_note.*
+import kotlinx.android.synthetic.main.dialog_draw.view.*
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import java.io.File
 import java.io.IOException
+import java.io.OutputStream
+import java.text.SimpleDateFormat
 import java.util.*
 
 
@@ -48,7 +64,6 @@ class Text_note : AppCompatActivity() {
 
     var currentLocation : Location? = null
     var fusedLocationProviderClient: FusedLocationProviderClient? = null
-    val REQUEST_CODE = 101
 
     lateinit var image_Uri: Uri
     lateinit var fileUri: Uri
@@ -64,12 +79,14 @@ class Text_note : AppCompatActivity() {
     var fontclr: Int = R.color.black
     var txtsize: Float = 16.0F
     var font: Int = R.font.roboto_regular
-
+    var fontstring= ""
+    val REQUEST_CODE = 101
     var my_loc :String=""
     var addressline :String=""
     var lat: String=""
     var lng:String=""
 
+    var bookmark :String=""
 
     var day=0
     var month=0
@@ -79,7 +96,18 @@ class Text_note : AppCompatActivity() {
     var returndate=""
     var returndate2=""
     var reminderDateTimeInMilliseconds: Long = 0
+    var alarmDate= "add reminder"
+
+    private lateinit var fileUri2: Uri
+    private lateinit var apiService: ApiService
+    private var catPhoto = File("")
+
+     var _id = System.currentTimeMillis().toInt()
+
+    var fabVisible = false
 
+    @SuppressLint("NotifyDataSetChanged")
+    @RequiresApi(Build.VERSION_CODES.Q)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_text_note)
@@ -87,17 +115,19 @@ class Text_note : AppCompatActivity() {
 
         var typeface = ResourcesCompat.getFont(this, font)
 
-        val imageView= findViewById<ImageView>(R.id.image)
+        val addFAB = findViewById<FloatingActionButton>(R.id.idFABAdd)
+
         val cardView = findViewById<CardView>(R.id.card2)
         val cardView1 = findViewById<CardView>(R.id.card1)
-        val done = findViewById<Button>(R.id.done)
+        val done = findViewById<FloatingActionButton>(R.id.done)
         val content = findViewById<EditText>(R.id.text_context)
         val text_title = findViewById<EditText>(R.id.text_title)
-        val currentloctn=  findViewById<TextView>(R.id.location)
-        val bgcolor = findViewById<ImageButton>(R.id.bgcolor)
-        val textfont = findViewById<ImageButton>(R.id.textfont)
-        val textSize = findViewById<ImageButton>(R.id.textsize)
-        val font_color = findViewById<ImageButton>(R.id.fontcolor)
+        val tv_currentloctn=  findViewById<TextView>(R.id.location)
+
+        val bgcolor = findViewById<FloatingActionButton>(R.id.bgcolor)
+        val textfont = findViewById<FloatingActionButton>(R.id.textfont)
+        val textSize = findViewById<FloatingActionButton>(R.id.textsize)
+        val font_color = findViewById<FloatingActionButton>(R.id.fontcolor)
         val imgUriList = ArrayList<Uri>()
         val imageNameList = ArrayList<String>()
         val img_recyclerview = findViewById<RecyclerView>(R.id.img_attach)
@@ -105,8 +135,12 @@ class Text_note : AppCompatActivity() {
         val alarm_tv= findViewById<TextView>(R.id.alarm_tv)
         val myCalendar: Calendar = Calendar.getInstance()
         val bookmrk = findViewById<ImageView>(R.id.bookmark)
-        val mybookmrk = findViewById<ImageButton>(R.id.my_bookmark)
-        val my_drawing= findViewById<ImageButton>(R.id.my_sketch)
+        val mybookmrk = findViewById<FloatingActionButton>(R.id.my_bookmark)
+        val my_drawing= findViewById<FloatingActionButton>(R.id.my_sketch)
+
+        fabVisible = false
+
+
 
         val time =TimePickerDialog.OnTimeSetListener{ view, hour,minute ->
             //time save hua
@@ -118,10 +152,10 @@ class Text_note : AppCompatActivity() {
             val minuteVar = if (minute < 10) "0$minute" else minute.toString() + ""
             returndate2= "$hourvar:$minuteVar"
 
+            alarmDate= returndate+" "+returndate2
             // returndate2= "$hour: $minute"
-            alarm_tv.setText(returndate+ " "+returndate2)
+            alarm_tv.setText(alarmDate)
 
-            setAlarm()
 
         }
         val date =
@@ -155,11 +189,30 @@ class Text_note : AppCompatActivity() {
 
         }
 
+        alarm_tv.setOnLongClickListener {
+            //cancelAlarm()
+
+            val dialog = AlertDialog.Builder(this)
+            dialog.setMessage("Do you want to delete this image?")
+            dialog.setPositiveButton("Yes", DialogInterface.OnClickListener { _, _ ->
+
+                alarmDate= "add reminder"
+                    alarm_tv.setText(alarmDate)
+            })
+
+            dialog.show()
+
+            true
+        }
+
         content.setTextSize(txtsize)
         text_title.setTypeface(typeface)
         content.setTypeface(typeface)
 
         var ooo: String =""
+        bookmrk.setImageResource(R.drawable.bookmark_border_24)
+        bookmark="untag"
+
         mybookmrk.setOnClickListener {
             val view = layoutInflater.inflate(R.layout.dialog_bookmark, null)
             val mBuilder = AlertDialog.Builder(this)
@@ -171,34 +224,41 @@ class Text_note : AppCompatActivity() {
             red.setOnClickListener {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_red)
+                bookmark="red"
             }
 
             val blue= view.findViewById<LinearLayout>(R.id.bookmrk_Travel)
             blue.setOnClickListener() {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_blue)
+                bookmark= "blue"
             }
 
             val green= view.findViewById<LinearLayout>(R.id.bookmrk_personal)
             green.setOnClickListener {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_grren)
+                bookmark="green"
             }
             val yellow= view.findViewById<LinearLayout>(R.id.bookmrk_life)
             yellow.setOnClickListener {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_yellow)
+                bookmark="yellow"
             }
             val orange= view.findViewById<LinearLayout>(R.id.bookmrk_birthday)
             orange.setOnClickListener {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_orage)
+                bookmark="orange"
             }
             val untag= view.findViewById<LinearLayout>(R.id.bookmrk_untag)
             untag.setOnClickListener {
                 mAlertDialog.dismiss()
                 bookmrk.setImageResource(R.drawable.bookmark_border_24)
+                bookmark="untag"
             }
+            hideFabs()
         }
 
         textfont.setOnClickListener {
@@ -212,6 +272,7 @@ class Text_note : AppCompatActivity() {
             comforta_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.comfortaa_bold
+                fontstring= "comforta_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -222,6 +283,7 @@ class Text_note : AppCompatActivity() {
             comforta_light.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.comfortaa_light
+                fontstring= "comfortaa_light"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -232,6 +294,8 @@ class Text_note : AppCompatActivity() {
             comforta_meddium.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.comfortaa_medium
+
+                fontstring= "comfortaa_meddium"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -240,7 +304,8 @@ class Text_note : AppCompatActivity() {
             val comforta_reg = view.findViewById<TextView>(R.id.comfortaa_reg)
             comforta_reg.setOnClickListener {
                 mAlertDialog.dismiss()
-                font= R.font.comfortaa_bold
+                font= R.font.comfortaa_regular
+                fontstring= "comfortaa_regular"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -250,6 +315,7 @@ class Text_note : AppCompatActivity() {
             dancing_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.dancing_script_bold
+                fontstring= "dancing_script_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -260,6 +326,7 @@ class Text_note : AppCompatActivity() {
             dancing_med.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.dancing_script_med
+                fontstring= "dancing_script_med"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -269,6 +336,7 @@ class Text_note : AppCompatActivity() {
             dancing_reg.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.dancing_script_reg
+                fontstring= "dancing_script_reg"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -278,6 +346,7 @@ class Text_note : AppCompatActivity() {
             gotham_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.gotham_bold
+                fontstring= "gotham_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -286,7 +355,8 @@ class Text_note : AppCompatActivity() {
             val gotham_med = view.findViewById<TextView>(R.id.gotham_medium)
             gotham_med.setOnClickListener {
                 mAlertDialog.dismiss()
-                font= R.font.comfortaa_medium
+                font= R.font.gotham_medium
+                fontstring= "gotham_medium"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -296,6 +366,7 @@ class Text_note : AppCompatActivity() {
             gotham_italic.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.gotham_medium_italic
+                fontstring= "gotham_medium_italic"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -305,6 +376,7 @@ class Text_note : AppCompatActivity() {
             lato_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.lato_bold
+                fontstring= "lato_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -314,6 +386,7 @@ class Text_note : AppCompatActivity() {
             lato_italic.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.lato_italic
+                fontstring= "lato_italic"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -323,6 +396,7 @@ class Text_note : AppCompatActivity() {
             lato_reg.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.lato_reg
+                fontstring= "lato_reg"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -332,6 +406,7 @@ class Text_note : AppCompatActivity() {
             montserrat_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.montserrat_bold
+                fontstring="montserrat_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -341,6 +416,7 @@ class Text_note : AppCompatActivity() {
             montserrat_italic.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.montserrat_italic
+                fontstring= "montserrat_italic"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -350,6 +426,7 @@ class Text_note : AppCompatActivity() {
             montserrat_reg.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.montserrat_reg
+                fontstring= "montserrat_reg"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -359,6 +436,7 @@ class Text_note : AppCompatActivity() {
             poppins_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.poppins_bold
+                fontstring="poppins_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -368,6 +446,8 @@ class Text_note : AppCompatActivity() {
             poppins_italic.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.poppins_italic
+                fontstring= "poppins_italic"
+
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -377,6 +457,8 @@ class Text_note : AppCompatActivity() {
             poppins_reg.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.poppins_regular
+                fontstring= "poppins_regular"
+
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -386,6 +468,7 @@ class Text_note : AppCompatActivity() {
             roboto_bold.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.roboto_bold
+                fontstring= "roboto_bold"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -395,6 +478,7 @@ class Text_note : AppCompatActivity() {
             roboto_italic.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.roboto_italic
+                fontstring= "roboto_italic"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -404,6 +488,7 @@ class Text_note : AppCompatActivity() {
             roboto_reg.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.roboto_regular
+                fontstring= "roboto_regular"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -413,6 +498,7 @@ class Text_note : AppCompatActivity() {
             pacifico.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.pacifico
+                fontstring= "pacifico"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -422,6 +508,7 @@ class Text_note : AppCompatActivity() {
             satisfy.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.satisfy
+                fontstring= "satisfy"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -431,6 +518,7 @@ class Text_note : AppCompatActivity() {
             shadows.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.shadows_into_light
+                fontstring= "shadows_into_light"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
@@ -440,15 +528,18 @@ class Text_note : AppCompatActivity() {
             waver.setOnClickListener {
                 mAlertDialog.dismiss()
                 font= R.font.waver
+                fontstring= "waver"
                 typeface = ResourcesCompat.getFont(this, font)
                 content.setTypeface(typeface)
                 text_title.setTypeface(typeface)
 
             }
 
+            hideFabs()
         }
 
         textSize.setOnClickListener {
+
             val view = layoutInflater.inflate(R.layout.dialog_size, null)
             val mBuilder = AlertDialog.Builder(this)
                 .setView(view)
@@ -481,6 +572,7 @@ class Text_note : AppCompatActivity() {
 
         }
         font_color.setOnClickListener {
+            hideFabs()
             val view = layoutInflater.inflate(R.layout.color_dialog, null)
             val mBuilder = AlertDialog.Builder(this)
                 .setView(view)
@@ -504,6 +596,7 @@ class Text_note : AppCompatActivity() {
             }
         }
         bgcolor.setOnClickListener {
+hideFabs()
 
             val view = layoutInflater.inflate(R.layout.color_dialog, null)
             val mBuilder = AlertDialog.Builder(this)
@@ -532,22 +625,20 @@ class Text_note : AppCompatActivity() {
         }
 
         // for file upload
-        val fileupload = findViewById<ImageButton>(R.id.fileupload)
+        val fileupload = findViewById<FloatingActionButton>(R.id.img_upload)
         val file_Name = ArrayList<String>()
         val fileUriList = ArrayList<Uri>()
+
+        val arrayList = ArrayList<ImageModel>()
         val file_recyclerview = findViewById<RecyclerView>(R.id.file_attach)
-        val file_adapter = AdapterFile_attach(fileUriList, file_Name, this)
+        val file_adapter = AdapterFile_attach(arrayList, this)
 
         file_recyclerview.adapter = file_adapter
         file_recyclerview.layoutManager = GridLayoutManager(this, 2)
 
-//        file_recyclerview.layoutManager = LinearLayoutManager(this)
-
-//        img_recyclerview.adapter = img_adapter
-//        img_recyclerview.layoutManager = LinearLayoutManager(this)
-
 
         my_drawing.setOnClickListener {
+            hideFabs()
             val view = layoutInflater.inflate(R.layout.dialog_draw, null)
             val mBuilder = AlertDialog.Builder(this)
                 .setView(view)
@@ -571,25 +662,30 @@ class Text_note : AppCompatActivity() {
             }
             done.setOnClickListener {
                 mAlertDialog.dismiss()
-                val getit : String = drawingView.id.toString()
-                file_Name.add(getit.toString())
-                drawingView.isSaveEnabled
-                file_adapter.notifyDataSetChanged()
-//                val bitmap = drawingView.saveAsBitmap()
-//                val uri= Uri.parse(bitmap.toString())
+                val myUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    getImageUri( drawingView.drawing_view.saveAsBitmap())
+                } else {
+                    TODO("VERSION.SDK_INT < Q")
+                }
+
+                myUri?.let {
+                    fileUriList.add(it)
+                    file_Name.add(it.toString())
+                    val name= it.toString()
+                    val urii = it
+                    val model:ImageModel
+                    model= ImageModel(name,urii)
 
-                //   Log.e("getit",uri.toString())
+                    arrayList.add(model)
 
 
-                val bitmap = Bitmap.createBitmap(drawingView.saveAsBitmap())
-                val stream = ByteArrayOutputStream()
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
-                val byteArray: ByteArray = stream.toByteArray()
 
-                val encoded: String = Base64.encodeToString(byteArray, Base64.DEFAULT)
+                }
+                drawingView.isSaveEnabled
+                file_adapter.notifyDataSetChanged()
+
+                   Log.e("getit",myUri.toString())
 
-                imageView.setImageBitmap(getBitMap(encoded))
-                //  fileUriList.add(uri)
 
 
             }
@@ -597,32 +693,6 @@ class Text_note : AppCompatActivity() {
 
         }
 
-        fun getFileName(uri: Uri?): String {
-            result = null.toString()
-            if (uri != null) {
-                if (uri.scheme == "content") {
-                    val cursor = contentResolver.query(uri, null, null, null, null)
-                    try {
-                        if (cursor != null && cursor.moveToFirst()) {
-                            result =
-                                cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME))
-                        }
-                    } finally {
-                        cursor!!.close()
-                    }
-                }
-            }
-            if (result == null) {
-                if (uri != null) {
-                    result = uri.path.toString()
-                }
-                val cut: Int = result.lastIndexOf('/')
-                if (cut != -1) {
-                    result = result.substring(cut + 1)
-                }
-            }
-            return result
-        }
 
 
 // Receiver
@@ -634,10 +704,16 @@ class Text_note : AppCompatActivity() {
                     if (it.data?.data != null) {
 
                         fileUri = Uri.parse(it.data!!.data.toString())
+                        Log.e("getit",fileUri.toString())
+
                         fileUriList.add(fileUri)
-                        fileName = getFileName(fileUri)
-                        Log.e("name", fileName)
-                        file_Name.add(fileName)
+                        file_Name.add(fileUri.toString())
+                        val model:ImageModel
+                        model= ImageModel(fileName,fileUri)
+
+                        arrayList.add(model)
+
+
                         file_adapter.notifyDataSetChanged()
 
 
@@ -651,12 +727,17 @@ class Text_note : AppCompatActivity() {
 
                             fileUri = it.data!!.clipData!!.getItemAt(i).uri
                             fileUriList.add(fileUri)
-                            fileName = getFileName(fileUri)
-                            Log.e("name", fileName)
-                            file_Name.add(fileName)
+                            file_Name.add(fileUri.toString())
                             file_adapter.notifyItemInserted(i)
                             file_adapter.notifyDataSetChanged()
 
+                            val model:ImageModel
+                            model= ImageModel(fileName,fileUri)
+
+                            arrayList.add(model)
+
+
+
                         }
                     }
 
@@ -665,9 +746,10 @@ class Text_note : AppCompatActivity() {
             }
 
         fileupload.setOnClickListener {
+            hideFabs()
 
             val intent2 = Intent(Intent.ACTION_OPEN_DOCUMENT)
-            intent2.setType("*/*")
+            intent2.setType("image/*")
             intent2.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
             //         intent2.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,false)
 //
@@ -699,7 +781,7 @@ class Text_note : AppCompatActivity() {
                     val geocoder = Geocoder(this, Locale.getDefault())
                     val addresses: List<Address> = geocoder.getFromLocation(currentLocation!!.latitude, currentLocation!!.longitude, 1)
                     if (addresses.size > 0) {
-                        currentloctn.setText(addresses[0].getAddressLine(0))
+                        tv_currentloctn.setText(addresses[0].getAddressLine(0))
                         addressline= addresses[0].getAddressLine(0)
                         Log.e("location_inside",addresses[0].adminArea)
                         Log.e("location_inside2",addresses[0].locality)
@@ -711,7 +793,7 @@ class Text_note : AppCompatActivity() {
                     }
                     Log.e("location_inside",ooo)
 
-                    currentloctn.setOnClickListener {
+                    tv_currentloctn.setOnClickListener {
                         val t = Toast.makeText(this, my_loc, Toast.LENGTH_SHORT)
                         t.show()
                         val strUri =
@@ -739,7 +821,8 @@ class Text_note : AppCompatActivity() {
                 ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_CODE)
                 return
             }
-            currentloctn.setText(mysearch)
+            tv_currentloctn.setText(mysearch)
+            addressline= mysearch
             Log.e("mysrch",mysearch)
             var addressList: List<Address>? = null
 
@@ -764,7 +847,7 @@ class Text_note : AppCompatActivity() {
                 }
 
 
-                currentloctn.setOnClickListener {
+                tv_currentloctn.setOnClickListener {
                     val t = Toast.makeText(this, my_loc, Toast.LENGTH_SHORT)
                     t.show()
                     val strUri =
@@ -782,7 +865,8 @@ class Text_note : AppCompatActivity() {
             }
         }
 
-        findViewById<ImageButton>(R.id.my_location).setOnClickListener {
+        findViewById<FloatingActionButton>(R.id.my_location).setOnClickListener {
+            hideFabs()
             val view = layoutInflater.inflate(R.layout.alertdialog_cocation, null)
             val mBuilder = AlertDialog.Builder(this)
                 .setView(view)
@@ -807,37 +891,165 @@ class Text_note : AppCompatActivity() {
             }
 
         }
+        addFAB.setOnClickListener {
+
+            if (!fabVisible) {
+                mybookmrk.visibility= View.VISIBLE
+                my_drawing.visibility= View.VISIBLE
+                textSize.visibility= View.VISIBLE
+                textfont.visibility= View.VISIBLE
+                font_color.visibility= View.VISIBLE
+                bgcolor.visibility= View.VISIBLE
+                my_location.visibility= View.VISIBLE
+                fileupload.visibility= View.VISIBLE
+                done.visibility= View.GONE
+
+                addFAB.setImageResource(R.drawable.ic_close)
+                fabVisible = true
 
+            }
+            else{
+                hideFabs()
+
+            }
+
+        }
 
         done.setOnClickListener {
             val title: String = text_title.text.toString()
             val contnt: String = content.text.toString()
 
-            Log.e("clr bgg",bg_clr.toString()+" ")
-            Log.e("clr f",fontclr.toString()+" ")
-            Log.e("check2",returndate.toString()+" "+ returndate2)
+            val sdf = SimpleDateFormat("dd/M/yyyy hh:mm:ss")
+            val currentDate = sdf.format(Date())
+
+            val reminder_date = returndate + " " + returndate2
+            db.addNotes(
+                text_title.text.toString(),
+                content.text.toString(),
+                txtsize.toString(),
+                fontstring.toString(),
+                fontclr.toString(),
+                bg_clr.toString(),
+                addressline,
+                file_Name,
+                bookmark,
+                currentDate,
+                alarmDate
+            )
+            //   uploadImageToServer()
+            if (alarmDate!="add reminder")
+            {
+                setAlarm()
+            }
+
+            finish() }
+
+    }
+
+    private fun hideFabs() {
+
+        textsize.visibility= View.GONE
+        my_bookmark.visibility= View.GONE
+        my_sketch.visibility= View.GONE
+        fontcolor.visibility= View.GONE
+        textfont.visibility= View.GONE
+        fontcolor.visibility= View.GONE
+        bgcolor.visibility= View.GONE
+        my_location.visibility= View.GONE
+        img_upload.visibility= View.GONE
+        done.visibility= View.VISIBLE
+        idFABAdd.setImageResource(R.drawable.ic_add)
+        fabVisible = false
 
-            val abc:String= my_loc
+    }
 
-            db.addNotes(text_title.text.toString(), content.text.toString(),
-                txtsize.toString() , font.toString(), fontclr.toString(), bg_clr.toString())
 
+    //for multipart
+    private fun uploadImageToServer() {
+        val builder: MultipartBody.Builder = MultipartBody.Builder()
+        builder.setType(MultipartBody.FORM)
+
+        if (catPhoto.length() > 0) {
+            builder.addFormDataPart(
+                "file",
+                catPhoto.name,
+                catPhoto.asRequestBody("image/jpeg".toMediaTypeOrNull())
+            )
+            builder.addFormDataPart("sub_id", "something")
+
+            val body = builder.build()
+            apiService.uploadPhoto(body).enqueue(object : Callback<ImageModel> {
+                override fun onResponse(
+                    call: Call<ImageModel>,
+                    response: Response<ImageModel>
+                ) {
+                    Log.d("TAG", "onResponse: ${response.body()}")
+                }
+
+                override fun onFailure(call: Call<ImageModel>, t: Throwable) {
+                    Log.d("TAG", "onFailure: ${t.localizedMessage}")
+                }
+
+            })
+        }
+    }
 
-            finish()
+    //for sketch images
+    @RequiresApi(Build.VERSION_CODES.Q)
+fun getImageUri(inImage: Bitmap): Uri? {
+
+    val filename = "IMG_${System.currentTimeMillis()}.jpg"
+    var fos: OutputStream? = null
+    val contentValues = ContentValues().apply {
+        put(DISPLAY_NAME, filename)
+        put(MIME_TYPE, "image/png")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            put(RELATIVE_PATH, DIRECTORY_DCIM)
         }
+        put(IS_PENDING, 1)
+    }
+
+
+    //use application context to get contentResolver
+    val uri = contentResolver.insert(EXTERNAL_CONTENT_URI, contentValues)
+    uri?.let { contentResolver.openOutputStream(it) }.also { fos = it }
+    fos?.use { inImage.compress(Bitmap.CompressFormat.PNG, 100, it) }
+    fos?.flush()
+    fos?.close()
+
+    contentValues.clear()
+    contentValues.put(IS_PENDING, 0)
 
+    uri?.let {
+        contentResolver.update(it, contentValues, null, null)
     }
+
+    return uri
+    }
+
+
+    private fun cancelAlarm() {
+
+        val intent = Intent(this, BroadcastService::class.java)
+
+        val pendingIntent = PendingIntent.getBroadcast(this, _id, intent, 0)
+        val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
+        alarmManager.cancel(pendingIntent)
+
+    }
+
     private fun setAlarm() {
         val manager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
         val myIntent: Intent
-        val _id = System.currentTimeMillis().toInt()
 
-        val pendingIntent: PendingIntent
         myIntent = Intent(this, BroadcastService::class.java)
         myIntent.putExtra("time",returndate2)
+        myIntent.putExtra("title",text_title.text.toString())
 
+        val pendingIntent: PendingIntent
         pendingIntent = PendingIntent.getBroadcast(this, _id, myIntent, PendingIntent.FLAG_UPDATE_CURRENT)
 
+
         val setdate: Calendar
         setdate= Calendar.getInstance()
 
@@ -853,18 +1065,4 @@ class Text_note : AppCompatActivity() {
         manager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, (reminderDateTimeInMilliseconds), pendingIntent)
     }
 
-    fun getBitMap(encodedString: String?): Bitmap? {
-        return try {
-            val decoder: java.util.Base64.Decoder = java.util.Base64.getDecoder()
-            val decoded = String(decoder.decode(encodedString))
-
-
-            val decodedString: ByteArray = decoded.toByteArray()
-            BitmapFactory.decodeByteArray(decodedString, 0, decodedString.size)
-        } catch (e: Exception) {
-            e.message
-            null
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/ViewNotes.kt b/app/src/main/java/com/example/enotes/ViewNotes.kt
index 2b69105..e935cff 100644
--- a/app/src/main/java/com/example/enotes/ViewNotes.kt
+++ b/app/src/main/java/com/example/enotes/ViewNotes.kt
@@ -1,47 +1,119 @@
 package com.example.enotes
 
+import android.Manifest
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
+import android.location.Address
+import android.location.Geocoder
+import android.location.Location
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
-import android.widget.EditText
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.View
+import android.widget.*
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.maps.model.LatLng
+import kotlinx.android.synthetic.main.activity_view_notes.*
+import java.io.IOException
+import java.util.*
 
 class ViewNotes : AppCompatActivity() {
 
 
+    val REQUEST_CODE = 101
+    var my_loc :String=""
+    var addressline :String=""
+    var lat: String=""
+    var lng:String=""
+    var currentLocation : Location? = null
+    var fusedLocationProviderClient: FusedLocationProviderClient? = null
+    var updatedAddress= ""
 
     @SuppressLint("ResourceAsColor")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_view_notes)
-        val mycontent = findViewById<EditText>(R.id.text_context)
         val text_title = findViewById<EditText>(R.id.text_title)
-        val bgcolor = findViewById<ImageButton>(R.id.bgcolor)
-        val textfont = findViewById<ImageButton>(R.id.textfont)
-        val textSize = findViewById<ImageButton>(R.id.textsize)
-        val font_color = findViewById<ImageButton>(R.id.fontcolor)
         val cardView = findViewById<CardView>(R.id.card2)
         val cardView1 = findViewById<CardView>(R.id.card1)
+        val mycontent = findViewById<EditText>(R.id.text_context)
 
         val tilte = intent.extras!!.getString("title")
         val content = intent.extras!!.getString("content")
         val textsize = intent.extras!!.getString("textsize")
         val textclr = intent.extras!!.getString("textclr")
-        val fonts = intent.extras!!.getInt("font")
         val bgclr = intent.extras!!.getString("bg")
+        val reminder_date= intent.extras!!.getString("reminder_date")
 
+        Log.e("reminder_date",reminder_date.toString())
+        if (reminder_date=="add reminder"){
+            view_reminders.setText(" ")
+        }
+        else{
+        view_reminders.setText("Reminder set for "+reminder_date)}
+        val address= intent.extras!!.getString("address")
+        viewAddress.setText(address)
+        viewAddress.setOnClickListener {
+            fetchLocationSearch(address)
 
-        val myfont: Int = R.font.roboto_regular
+        }
+// to update notes
+        update.setOnClickListener {
+            update.visibility = View.GONE
+            view_done.visibility= View.VISIBLE
+
+            text_title.isFocusableInTouchMode =true
+            text_context.isFocusableInTouchMode= true
+
+     edit_address.visibility= View.VISIBLE
+        }
+
+        view_done.setOnClickListener {
+            Toast.makeText(this, "updated" +updatedAddress, Toast.LENGTH_SHORT).show()
+
+            finish()
+        }
+
+        edit_address.setOnClickListener {
+
+            val view = layoutInflater.inflate(R.layout.alertdialog_cocation, null)
+            val mBuilder = AlertDialog.Builder(this)
+                .setView(view)
+                .setTitle("Search Location")
+            val mAlertDialog = mBuilder.show()
+            val use_current_location = view.findViewById<TextView>(R.id.my_current_location)
+            val search_location = view.findViewById<EditText>(R.id.seach_loc)
+            val search = view.findViewById<Button>(R.id.seach_btn)
+
+            use_current_location.setOnClickListener {
+                mAlertDialog.dismiss()
+                fetchLocation()
+            }
 
-       // var typeface = ResourcesCompat.getFont(this, fonts)
+            search.setOnClickListener {
+                mAlertDialog.dismiss()
+                val mysearch: String= search_location.text.toString()
+                Log.e("mysrch1",mysearch)
 
-        Log.e("inside c",bgclr.toString())
+                fetchLocationSearch(mysearch)
+
+            }
+
+        }
+// to set fonts
+        showFonts()
+
+
+        Log.e("inside c",textclr.toString())
         val clr: Int =R.color.black
         val bgclrr: Int =R.color.bbbb
 
@@ -51,17 +123,14 @@ class ViewNotes : AppCompatActivity() {
         text_title.setText(tilte.toString())
         mycontent.setText(content.toString())
 
-
-
-
-            cardView1.setCardBackgroundColor(bgclrr)
+           cardView1.setCardBackgroundColor(bgclrr)
             cardView.setCardBackgroundColor(bgclrr)
 
         if (bgclr != null) {
             cardView1.setCardBackgroundColor(bgclr.toInt())
             cardView.setCardBackgroundColor(bgclr.toInt())
 
-            if (bgclr=="2131035092"){
+            if (bgclr=="2131035097"){
                 Log.e("inside"," backgrnd")
 
                 cardView1.setCardBackgroundColor(Color.WHITE)
@@ -71,18 +140,6 @@ class ViewNotes : AppCompatActivity() {
         }
 
 
-
-
-
-//            if (bgclr == null) {
-//                Log.e("inside","no backgrnd")
-//                cardView1.backgroundTintList(ContextCompat.getColor(this, R.color.white));
-//
-//
-//            }
-
-
-
         if (textclr != null) {
            text_title.setTextColor(textclr.toInt())
            mycontent.setTextColor(textclr.toInt())
@@ -100,8 +157,279 @@ class ViewNotes : AppCompatActivity() {
 
         }
 
-//
-//        text_title.setTypeface(typeface)
-//        mycontent.setTypeface(typeface)
+
+
+    }
+    fun fetchLocationSearch(address: String?) {
+
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_COARSE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED)
+        {
+            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_CODE)
+            return
+        }
+        var addressList: List<Address>? = null
+
+        if (address != null || address != "") {
+
+
+
+            val geocoder = Geocoder(this)
+            try {
+                addressList = geocoder.getFromLocationName(address, 1)
+            } catch (e: IOException) {
+                Log.e("error1", e.message.toString())
+            }
+            try {
+                val address = addressList!![0]
+                val latLng = LatLng(address.latitude, address.longitude)
+                my_loc = latLng.toString()
+                lat= address.latitude.toString()
+                lng= address.longitude.toString()
+
+            } catch (d: java.lang.Exception) {
+                Log.e("error", d.message.toString())
+            }
+
+
+            updatedAddress= address.toString()
+            viewAddress.setText(address)
+            viewAddress.setOnClickListener {
+                val strUri =
+                    "http://maps.google.com/maps?q=loc:" + lat+ "," + lng+ " (" + address + ")"
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(strUri))
+
+                intent.setClassName(
+                    "com.google.android.apps.maps",
+                    "com.google.android.maps.MapsActivity"
+                )
+
+                startActivity(intent)
+            }
+
+        }
+
+
     }
+
+    private fun showFonts() {
+        val fonts = intent.extras!!.getString("font")
+        val myfont: Int = R.font.roboto_regular
+
+        var typeface = ResourcesCompat.getFont(this, myfont)
+        text_title.setTypeface(typeface)
+        text_context.setTypeface(typeface)
+        if (fonts == "waver") {
+            typeface = ResourcesCompat.getFont(this, R.font.waver)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "shadows_into_light") {
+            typeface = ResourcesCompat.getFont(this, R.font.shadows_into_light)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "satisfy") {
+            typeface = ResourcesCompat.getFont(this, R.font.satisfy)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "pacifico") {
+            typeface = ResourcesCompat.getFont(this, R.font.pacifico)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "roboto_regular") {
+            typeface = ResourcesCompat.getFont(this, R.font.roboto_regular)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "roboto_italic") {
+            typeface = ResourcesCompat.getFont(this, R.font.roboto_italic)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "roboto_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.roboto_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "poppins_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.poppins_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "poppins_italic") {
+            typeface = ResourcesCompat.getFont(this, R.font.poppins_italic)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "poppins_regular") {
+            typeface = ResourcesCompat.getFont(this, R.font.poppins_regular)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "montserrat_reg") {
+            typeface = ResourcesCompat.getFont(this, R.font.montserrat_reg)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "montserrat_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.montserrat_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "montserrat_italic") {
+            typeface = ResourcesCompat.getFont(this, R.font.montserrat_italic)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "lato_reg") {
+            typeface = ResourcesCompat.getFont(this, R.font.lato_reg)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "lato_italic") {
+            typeface = ResourcesCompat.getFont(this, R.font.lato_italic)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "lato_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.lato_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "gotham_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.gotham_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "gotham_medium_italic") {
+            typeface = ResourcesCompat.getFont(this, R.font.gotham_medium_italic)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+
+        if (fonts == "gotham_medium") {
+            typeface = ResourcesCompat.getFont(this, R.font.gotham_medium)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "dancing_script_reg") {
+            typeface = ResourcesCompat.getFont(this, R.font.dancing_script_reg)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "dancing_script_med") {
+            typeface = ResourcesCompat.getFont(this, R.font.dancing_script_med)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+
+        if (fonts == "dancing_script_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.dancing_script_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "comfortaa_medium") {
+            typeface = ResourcesCompat.getFont(this, R.font.comfortaa_medium)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "comfortaa_bold") {
+            typeface = ResourcesCompat.getFont(this, R.font.comfortaa_bold)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+        if (fonts == "comfortaa_light") {
+            typeface = ResourcesCompat.getFont(this, R.font.comfortaa_light)
+            text_title.setTypeface(typeface)
+            text_context.setTypeface(typeface)
+
+        }
+
+    }
+
+     fun fetchLocation() {
+
+
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this,Manifest.permission.ACCESS_COARSE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED)
+        {
+            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_CODE)
+            return
+        }
+        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
+
+        val task = fusedLocationProviderClient!!.lastLocation
+        task.addOnSuccessListener { location ->
+            if (location != null){
+                currentLocation = location
+
+                val latLng = LatLng(currentLocation!!.latitude, currentLocation!!.longitude)
+                my_loc = latLng.toString()
+
+
+                val geocoder = Geocoder(this, Locale.getDefault())
+                val addresses: List<Address> = geocoder.getFromLocation(currentLocation!!.latitude, currentLocation!!.longitude, 1)
+                if (addresses.size > 0) {
+                    viewAddress.setText(addresses[0].getAddressLine(0))
+                    addressline= addresses[0].getAddressLine(0)
+                    Log.e("location_inside",addresses[0].adminArea)
+                    Log.e("location_inside2",addresses[0].locality)
+                    Log.e("location_inside3",addresses[0].countryName)
+                    Log.e("location_inside4",addresses[0].getAddressLine(0))
+                    Log.e("location_inside5",addresses[0].subAdminArea)
+                    Log.e("location_inside6",addresses[0].subLocality)
+
+                }
+
+                updatedAddress= addressline
+                viewAddress.setText(addressline)
+                viewAddress.setOnClickListener {
+                    val t = Toast.makeText(this, my_loc, Toast.LENGTH_SHORT)
+                    t.show()
+                    val strUri =
+                        "http://maps.google.com/maps?q=loc:" + currentLocation!!.latitude.toString() + "," + currentLocation!!.longitude.toString() + " (" + addressline + ")"
+                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(strUri))
+
+                    intent.setClassName(
+                        "com.google.android.apps.maps",
+                        "com.google.android.maps.MapsActivity"
+                    )
+
+                    startActivity(intent)
+                }
+    }
+
+
+}
+     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/adapter/AdapterFile_attach.kt b/app/src/main/java/com/example/enotes/adapter/AdapterFile_attach.kt
index 3a93f34..d372ef9 100644
--- a/app/src/main/java/com/example/enotes/adapter/AdapterFile_attach.kt
+++ b/app/src/main/java/com/example/enotes/adapter/AdapterFile_attach.kt
@@ -1,6 +1,8 @@
 package com.example.enotes.adapter
 
 import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
 import android.net.Uri
 import android.util.Log
 import android.view.LayoutInflater
@@ -8,10 +10,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
+import com.example.enotes.OpenImage
 import com.example.enotes.R
+import com.example.enotes.models.ImageModel
 
-class AdapterFile_attach(val file_uri : List<Uri> ,val file_name: ArrayList<String>, context: Context) : RecyclerView.Adapter<AdapterFile_attach.ViewHolder>(){
+class AdapterFile_attach(
+ val arrayList: ArrayList<ImageModel>,
+    val context: Context)
+    : RecyclerView.Adapter<AdapterFile_attach.ViewHolder>(){
+//    private var listData: MutableList<Uri> = data as MutableList<Uri>
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -21,20 +31,50 @@ class AdapterFile_attach(val file_uri : List<Uri> ,val file_name: ArrayList<Stri
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val uri: Uri = file_uri.get(position)
-        val name:String= file_name.get(position)
-        holder.image.setImageURI(uri)
-        holder.tv.setText(name)
-        Log.e("img",uri.toString())
+        val model: ImageModel = arrayList.get(position)
+
+        holder.image.setImageURI(model.uri)
+        holder.image.setOnClickListener {
+            val intent = Intent(context, OpenImage::class.java)
+            intent.putExtra("ImageUri", model.uri.toString())
+
+            context.startActivity(intent)
+        }
+
+        holder.image.setOnLongClickListener{
+
+            val dialog = AlertDialog.Builder(context)
+            dialog.setMessage("Do you want to delete this image?")
+            dialog.setPositiveButton("Yes", DialogInterface.OnClickListener { _, _ ->
+                deleteItem(position)
+
+            })
+
+            dialog.show()
+
+            true
+        }
+        Log.e("img", model.uri.toString())
     }
 
-    override fun getItemCount()= file_uri.size
+    override fun getItemCount()= arrayList.size
 
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
 
+        val card= itemView.findViewById<CardView>(R.id.img_card)
         val image: ImageView = itemView.findViewById(R.id.attach_file)
-        val tv: TextView = itemView.findViewById(R.id.file_name2)
+    }
+    fun deleteItem(position: Int) {
+
+
+            arrayList.removeAt(position)
+            notifyItemRemoved(position)
+        notifyItemRangeChanged(position, arrayList.size)
+
+
+        Log.e("delit", "del")
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/adapter/All_notes_adapter.kt b/app/src/main/java/com/example/enotes/adapter/All_notes_adapter.kt
index ed40ee6..408fd95 100644
--- a/app/src/main/java/com/example/enotes/adapter/All_notes_adapter.kt
+++ b/app/src/main/java/com/example/enotes/adapter/All_notes_adapter.kt
@@ -1,6 +1,7 @@
 package com.example.enotes.adapter
 
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
 import android.util.Log
 import android.view.LayoutInflater
@@ -9,21 +10,26 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.cardview.widget.CardView
-import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.example.enotes.MainActivity
 import com.example.enotes.R
 import com.example.enotes.ViewNotes
-import com.example.enotes.models.Deleting
 import com.example.enotes.models.create_note
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.collections.ArrayList
 
-class All_notes_adapter(val arrraylist: ArrayList<create_note>,val context: Context): RecyclerView.Adapter<All_notes_adapter.ViewHolder>(){
+class All_notes_adapter
+    (val arrraylist: ArrayList<create_note>, val context: Context) :
+
+    RecyclerView.Adapter<All_notes_adapter.ViewHolder>() {
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
 
-        val itemView = LayoutInflater.from(parent.context).inflate(R.layout.itemview_show_notes,parent,false);
+        val itemView = LayoutInflater.from(parent.context)
+            .inflate(R.layout.itemview_show_notes, parent, false);
         return ViewHolder(itemView)
 
     }
@@ -35,29 +41,74 @@ class All_notes_adapter(val arrraylist: ArrayList<create_note>,val context: Cont
 
         holder.content.setText(notes.content)
         holder.tittle.setText(notes.title)
-    //    holder.tittle.setTypeface(ResourcesCompat.getFont(context, notes.text_font.toInt()))
+        //    holder.tittle.setTypeface(ResourcesCompat.getFont(context, notes.text_font.toInt()))
+         val bookmark: String= notes.bookmark
+        if (bookmark=="red")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_red)
+        }
+        if (bookmark=="blue")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_blue)
+        }
+        if (bookmark=="green")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_grren)
+        }
+        if (bookmark=="yellow")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_yellow)
+        }
+        if (bookmark=="orange")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_orage)
+        }
+        if (bookmark=="untag")
+        {
+            holder.tags.setImageResource(R.drawable.bookmark_border_24)
+        }
 
+        holder.date.text= notes.currentDate
         holder.cardView.setOnClickListener {
+
             val intent = Intent(context, ViewNotes::class.java)
-            intent.putExtra("title",notes.title)
-            intent.putExtra("content",notes.content)
-            intent.putExtra("textsize",notes.txtsize)
-            intent.putExtra("textclr",notes.text_clr)
-            intent.putExtra("font",notes.text_font)
-            intent.putExtra("bg",notes.bg_clr)
-           context.startActivity (intent)
+            intent.putExtra("title", notes.title)
+            intent.putExtra("content", notes.content)
+            intent.putExtra("textsize", notes.txtsize)
+            intent.putExtra("textclr", notes.text_clr)
+            intent.putExtra("font", notes.text_font)
+            intent.putExtra("bg", notes.bg_clr)
+            intent.putExtra("reminder_date",notes.reminderDate)
+            intent.putExtra("address", notes.address)
+            context.startActivity(intent)
 
             Log.e("fontss", notes.bg_clr)
 
-//
 
         }
 
+        holder.delete.setOnClickListener {
+
+            val dialog = AlertDialog.Builder(context)
+            dialog.setTitle("Item deletion")
+            dialog.setMessage("Do you want to delete this item?")
+            dialog.setPositiveButton("Yes", DialogInterface.OnClickListener { _, _ ->
+                deleteItem(position)
+
+            })
+
+            dialog.show()
+
+
+        }
     }
 
-    override fun getItemCount()= arrraylist.size
 
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
+
+
+    override fun getItemCount() = arrraylist.size
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         val tags: ImageView = itemView.findViewById(R.id.tags)
         val delete: ImageView = itemView.findViewById(R.id.delete)
@@ -67,4 +118,10 @@ class All_notes_adapter(val arrraylist: ArrayList<create_note>,val context: Cont
         val cardView: CardView = itemView.findViewById(R.id.card)
     }
 
+    fun deleteItem(position: Int) {
+        arrraylist.removeAt(position)
+        notifyItemRemoved(position)
+        Log.e("delit", "del")
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/api/ApiClient.kt b/app/src/main/java/com/example/enotes/api/ApiClient.kt
new file mode 100644
index 0000000..7f29311
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/api/ApiClient.kt
@@ -0,0 +1,60 @@
+package com.example.designstuff.api
+
+import androidx.viewbinding.BuildConfig
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+import okhttp3.logging.HttpLoggingInterceptor
+
+
+object ApiClient {
+    private const val BASE_URL = "https://api.thecatapi.com/v1/"
+
+    private val client = buildClient()
+    private val retrofit = buildRetrofit(client)
+
+    private fun buildRetrofit(client: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(client)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+}
+    private fun buildClient(): OkHttpClient {
+        val interceptor = HttpLoggingInterceptor()
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
+        val builder = OkHttpClient.Builder()
+            .callTimeout(1, TimeUnit.MINUTES)
+            .addNetworkInterceptor(Interceptor { chain ->
+                var request = chain.request()
+                val builder = request.newBuilder()
+                builder.addHeader("Accept", "application/json")
+                request = builder.build()
+                chain.proceed(request)
+            })
+        if (BuildConfig.DEBUG) {
+            // Debug holatdan keyin o`chirish kerak!!!!!!!!!!!!!!!!!!!!!!!
+            builder.addInterceptor(interceptor)
+        }
+        return builder.build()
+    }
+
+    fun <T> createService(service: Class<T>): T {
+        return retrofit.create(service)
+    }
+
+    fun <T> createServiceWithAuth(service: Class<T>): T {
+        val newClient = client.newBuilder().addInterceptor(Interceptor { chain ->
+            var request = chain.request()
+            val builder = request.newBuilder()
+            builder.addHeader("x-api-key", "cd115401-446a-4694-b133-c558324ab265")
+            request = builder.build()
+            chain.proceed(request)
+        }).build()
+
+        val newRetrofit = retrofit.newBuilder().client(newClient).build()
+        return newRetrofit.create(service)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/api/ApiClientSignupLogin.kt b/app/src/main/java/com/example/enotes/api/ApiClientSignupLogin.kt
new file mode 100644
index 0000000..22adad9
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/api/ApiClientSignupLogin.kt
@@ -0,0 +1,33 @@
+package com.example.enotes.api
+
+import com.example.designstuff.api.ApiService
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object ApiClientSignupLogin {
+
+    fun getRetrofit(): Retrofit {
+
+        val logger = HttpLoggingInterceptor();
+        logger.setLevel(HttpLoggingInterceptor.Level.BASIC)
+
+        val client = OkHttpClient.Builder()
+            .addInterceptor(logger)
+            .build()
+
+        val retrofit = Retrofit.Builder()
+            .addConverterFactory(GsonConverterFactory.create())
+            .baseUrl("https://localhost:7032/api/")
+            .client(client)
+            .build()
+
+        return retrofit
+
+    }
+
+    fun getApiService(): ApiServiceSignupLogin{
+        return getRetrofit().create(ApiServiceSignupLogin::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/api/ApiService.kt b/app/src/main/java/com/example/enotes/api/ApiService.kt
new file mode 100644
index 0000000..206d4c0
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/api/ApiService.kt
@@ -0,0 +1,17 @@
+package com.example.designstuff.api
+
+import com.example.enotes.models.ImageModel
+import okhttp3.RequestBody
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+@JvmSuppressWildcards
+interface ApiService {
+    @POST("images/upload")
+fun uploadPhoto(
+        @Body body: RequestBody): Call<ImageModel>
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/api/ApiServiceSignupLogin.kt b/app/src/main/java/com/example/enotes/api/ApiServiceSignupLogin.kt
new file mode 100644
index 0000000..d882aea
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/api/ApiServiceSignupLogin.kt
@@ -0,0 +1,19 @@
+package com.example.enotes.api
+
+import com.example.enotes.models.request.LoginRequest
+import com.example.enotes.models.request.RegisterRequest
+import com.example.enotes.models.response.LoginResponse
+import com.example.enotes.models.response.RegisterResponse
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface ApiServiceSignupLogin {
+
+    @POST("/authentication")
+    fun loninUser(@Body loginRequest: LoginRequest): Call<LoginResponse>
+
+    @POST("Users/PostUsers")
+    fun registerUser(@Body registerRequest: RegisterRequest): Call<RegisterResponse>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/databasehelper/DbHelper.kt b/app/src/main/java/com/example/enotes/databasehelper/DbHelper.kt
index 21051a4..22a3e5c 100644
--- a/app/src/main/java/com/example/enotes/databasehelper/DbHelper.kt
+++ b/app/src/main/java/com/example/enotes/databasehelper/DbHelper.kt
@@ -9,6 +9,8 @@ import com.example.enotes.models.create_note
 
 class DbHelper(context:Context): SQLiteOpenHelper(context,DATABASE_NAME,null,DATABASE_VERSION){
 
+    lateinit var myDbInstance: SQLiteDatabase
+
     companion object {
         private val DATABASE_VERSION = 1
         private val DATABASE_NAME = "AddNotes"
@@ -20,26 +22,54 @@ class DbHelper(context:Context): SQLiteOpenHelper(context,DATABASE_NAME,null,DAT
         private val TEXT_FONT="text_font"
         private val TEXT_CLR="text_clr"
         private val BG_CLR="bg_clr"
+        private val ADDRESS = "address"
+        private val BOOKMARK = "bookmark"
+        private val CURRENT_DATE = "current_date"
+        private val REMINDER_DATE= "reminder_date"
+
+        // table for saving notes sketch images
+        private val TABLE_NOTES_SKETCH_IMAGE = "Notes_Sketch"
+        private val KEY_IMAGE_ID = "image_id"
+        private val KEY_NOTE_ID = "note_id"
+        private val KEY_IMAGE_URI = "image_uri"
+
+        // table for saving notes file images
+
+
     }
 
     override fun onCreate(db: SQLiteDatabase?) {
 
-        val CREATE_NOTES_TABLE = ("CREATE TABLE " + TABLE_NOTES+ "("
+        val CREATE_NOTES_TABLE = ("CREATE TABLE " + TABLE_NOTES + "("
                 + KEY_ID + " INTEGER PRIMARY KEY,"
                 + KEY_TITLE + " TEXT," + KEY_CONTENT + " TEXT,"
-                + TEXT_SIZE+ " TEXT," + TEXT_FONT+ " TEXT," + TEXT_CLR+ " TEXT,"
-                + BG_CLR+ " TEXT "+" )")
+                + TEXT_SIZE + " TEXT," + TEXT_FONT + " TEXT," + ADDRESS + " TEXT," + TEXT_CLR + " TEXT,"
+                + BG_CLR + " TEXT,"
+               + BOOKMARK + " TEXT,"
+                + CURRENT_DATE + " TEXT," + REMINDER_DATE + " TEXT "
+                + " )")
+
+
+        val CREATE_NOTES_IMAGE_TABLE = ("CREATE TABLE " + TABLE_NOTES_SKETCH_IMAGE + "( "
+                + KEY_IMAGE_ID + " INTEGER PRIMARY KEY,"
+                + KEY_NOTE_ID + " INTEGER,"
+                + KEY_IMAGE_URI + " TEXT " + ")"
+                )
         db?.execSQL(CREATE_NOTES_TABLE)
-    }
+        db?.execSQL(CREATE_NOTES_IMAGE_TABLE)}
 
     override fun onUpgrade(db: SQLiteDatabase?, oldversion: Int, newversion: Int) {
         db!!.execSQL("DROP TABLE IF EXISTS " + TABLE_NOTES)
+        db!!.execSQL("DROP TABLE IF EXISTS " + TABLE_NOTES_SKETCH_IMAGE)
         onCreate(db)
     }
 
-    fun addNotes(title : String, content : String,
-                 textsize:String,textfont: String,textclr: String,
-                 bgclr: String ){
+    fun addNotes(
+        title: String, content: String,
+        textsize: String, textfont: String, textclr: String,
+        bgclr: String, address: String, sketchList: ArrayList<String>, bookmark:String, date:String,reminder_date:String)
+    {
+        openDB()
      val values = ContentValues()
         values.put(KEY_TITLE, title)
         values.put(KEY_CONTENT, content)
@@ -47,55 +77,108 @@ class DbHelper(context:Context): SQLiteOpenHelper(context,DATABASE_NAME,null,DAT
         values.put(TEXT_FONT, textfont)
         values.put(TEXT_CLR,textclr )
         values.put(BG_CLR, bgclr)
+        values.put(ADDRESS, address)
+        values.put(BOOKMARK,bookmark)
+        values.put(CURRENT_DATE,date)
+        values.put(REMINDER_DATE,reminder_date)
+        Log.e("bookmarksss",bookmark)
+
+        val index = myDbInstance.insert(TABLE_NOTES, null, values)
+        Log.e("success22", "index of notes -> $index")
 
-        val db = this.writableDatabase
+        addSketchImageOfNotes(index.toInt(), sketchList)
 
-        db.insert(TABLE_NOTES, null, values)
-        Log.e("success22", bgclr.toString())
+        //close Database here when all operation done
+        closeDB()
 
-        // at last we are
-        // closing our database
-        db.close()
+    }
+    fun openDB() {
+        myDbInstance = this.writableDatabase
     }
 
-    //method to read data
+    fun closeDB() {
+        myDbInstance.close()
+    }
 
-    fun viewnote():List<create_note>{
-        val selectQuery = "SELECT  * FROM $TABLE_NOTES"
+    fun addSketchImageOfNotes(noteID: Int, sketchList: ArrayList<String>) {
+        openDB()
+        for (i in 0..sketchList.size.minus(1)) {
+            val values = ContentValues()
+            values.put(KEY_IMAGE_URI, sketchList.get(i))
+            values.put(KEY_NOTE_ID, noteID)
+            myDbInstance.insert(TABLE_NOTES_SKETCH_IMAGE, null, values)
+        }
 
-        val noteList:ArrayList<create_note> = ArrayList<create_note>()
+        closeDB()
+    }
 
-        val db = this.readableDatabase
+    //method to read data
+    fun viewnote(): List<create_note> {
+        openDB()
+        val selectQuery = "SELECT  * FROM $TABLE_NOTES"
+        val noteList: ArrayList<create_note> = ArrayList<create_note>()
 
-        val cursor = db.rawQuery(selectQuery, null)
+        val cursor = myDbInstance.rawQuery(selectQuery, null)
 
-//        var cursor: Cursor? = null
-//        try{
-//            cursor = db.rawQuery(selectQuery, null)
-//        }catch (e: SQLiteException) {
-//            db.execSQL(selectQuery)
-//            return ArrayList()
-//        }
         var note_id: Int
         var note_title: String
         var note_content: String
+
         if (cursor.moveToFirst()) {
             do {
 
                 note_id = cursor.getInt(cursor.getColumnIndexOrThrow(KEY_ID))
                 note_title = cursor.getString(cursor.getColumnIndexOrThrow("title"))
                 note_content = cursor.getString(cursor.getColumnIndexOrThrow("content"))
-                val textsize : String= cursor.getString(cursor.getColumnIndexOrThrow(TEXT_SIZE))
-                val textclr : String = cursor.getString(cursor.getColumnIndexOrThrow(TEXT_CLR))
-                val textfont: String= cursor.getString(cursor.getColumnIndexOrThrow(TEXT_FONT))
-                var bgclr: String= cursor.getString(cursor.getColumnIndexOrThrow(BG_CLR))
-
-                val note= create_note(id = note_id, title = note_title, content = note_content,
-                    txtsize = textsize, text_clr = textclr, text_font = textfont, bg_clr = bgclr)
+                val textsize: String = cursor.getString(cursor.getColumnIndexOrThrow(TEXT_SIZE))
+                val textclr: String = cursor.getString(cursor.getColumnIndexOrThrow(TEXT_CLR))
+                val textfont: String = cursor.getString(cursor.getColumnIndexOrThrow(TEXT_FONT))
+                val bgclr: String = cursor.getString(cursor.getColumnIndexOrThrow(BG_CLR))
+                val addres: String = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))
+                val bookmark: String = cursor.getString(cursor.getColumnIndexOrThrow(BOOKMARK))
+                val date: String= cursor.getString(cursor.getColumnIndexOrThrow(CURRENT_DATE))
+                val reminder_date:String= cursor.getString(cursor.getColumnIndexOrThrow(REMINDER_DATE))
+
+                val note = create_note(
+                    id = note_id,
+                    bg_clr = bgclr,
+                    txtsize = textsize,
+                    text_font = textfont,
+                    text_clr = textclr,
+                    title = note_title,
+                    content = note_content,
+                    address = addres,
+                    bookmark = bookmark,
+                    currentdate = date,
+                    reminderDate = reminder_date
+                )
+
+                /**
+                 * Code to get the sketch image of any note
+                 */
+                val selectedQueryForSketchImagesOfNotes =
+                    "SELECT * FROM $TABLE_NOTES_SKETCH_IMAGE where $KEY_NOTE_ID = '" + note_id + "'"
+                val sketchList = ArrayList<String>()
+                val innnerCursor = myDbInstance.rawQuery(selectedQueryForSketchImagesOfNotes, null)
+                if (innnerCursor.moveToFirst()) {
+                    do {
+                        sketchList.add(
+                            innnerCursor.getString(
+                                innnerCursor.getColumnIndexOrThrow(
+                                    KEY_IMAGE_URI
+                                )
+                            )
+                        )
+                    } while (innnerCursor.moveToNext())
+                }
+
+                note.imageUrl = sketchList
 
                 noteList.add(note)
             } while (cursor.moveToNext())
         }
+
+        closeDB()
         return noteList
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/Deleting.kt b/app/src/main/java/com/example/enotes/models/Deleting.kt
deleted file mode 100644
index 12fc472..0000000
--- a/app/src/main/java/com/example/enotes/models/Deleting.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.enotes.models
-
-interface Deleting {
-    fun onDelete(model: create_note)
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/ImageModel.kt b/app/src/main/java/com/example/enotes/models/ImageModel.kt
new file mode 100644
index 0000000..8fe7ca2
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/models/ImageModel.kt
@@ -0,0 +1,8 @@
+package com.example.enotes.models
+
+import android.net.Uri
+
+class ImageModel (
+    var name : String, var uri : Uri
+
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/create_note.kt b/app/src/main/java/com/example/enotes/models/create_note.kt
index 0540ad5..1fecc01 100644
--- a/app/src/main/java/com/example/enotes/models/create_note.kt
+++ b/app/src/main/java/com/example/enotes/models/create_note.kt
@@ -1,42 +1,52 @@
 package com.example.enotes.models
 
- class create_note{
+import android.net.Uri
 
+class create_note {
 
-     val id: Int
+
+    val id: Int
     val bg_clr: String
     val txtsize: String
     val text_font: String
     val text_clr: String
-     val title: String
+    val title: String
     val content: String
-
-     // val imageUrl: ArrayList<String>
-     //val fileUrl: ArrayList<String>
-     constructor(
-         id: Int,
-         bg_clr: String,
-         txtsize: String,
-         text_font: String,
-         text_clr: String,
-         title: String,
-         content: String
-     ) {
-         this.id = id
-         this.bg_clr = bg_clr
-         this.txtsize = txtsize
-         this.text_font = text_font
-         this.text_clr = text_clr
-         this.title = title
-         this.content = content
-     }
-
-
-     //constructor(): this(-1," ","null")
-
- }
-
-
-// {
-//    constructor(id: Int, title: String?, content: String?) : this()
-//}
\ No newline at end of file
+    val address: String
+    val bookmark: String
+    val currentDate: String
+    val reminderDate :String
+
+    var imageUrl = ArrayList<String>()
+
+    //val fileUrl: ArrayList<String>
+    constructor(
+        id: Int,
+        bg_clr: String,
+        txtsize: String,
+        text_font: String,
+        text_clr: String,
+        title: String,
+        content: String,
+        address: String,
+        bookmark: String,
+        currentdate: String,
+        reminderDate: String
+    )
+    {
+        this.id = id
+        this.bg_clr = bg_clr
+        this.txtsize = txtsize
+        this.text_font = text_font
+        this.text_clr = text_clr
+        this.title = title
+        this.content = content
+        this.address = address
+        this.bookmark= bookmark
+        this.currentDate= currentdate
+        this.reminderDate = reminderDate
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/request/LoginRequest.kt b/app/src/main/java/com/example/enotes/models/request/LoginRequest.kt
new file mode 100644
index 0000000..466ac45
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/models/request/LoginRequest.kt
@@ -0,0 +1,7 @@
+package com.example.enotes.models.request
+
+data class LoginRequest (
+    val email: String,
+    val password: String
+
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/request/RegisterRequest.kt b/app/src/main/java/com/example/enotes/models/request/RegisterRequest.kt
new file mode 100644
index 0000000..bf714ed
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/models/request/RegisterRequest.kt
@@ -0,0 +1,8 @@
+package com.example.enotes.models.request
+
+data class RegisterRequest (
+    val name:String,
+    val email: String,
+    val password: String
+
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/response/LoginResponse.kt b/app/src/main/java/com/example/enotes/models/response/LoginResponse.kt
new file mode 100644
index 0000000..62e198e
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/models/response/LoginResponse.kt
@@ -0,0 +1,8 @@
+package com.example.enotes.models.response
+
+data class LoginResponse  (
+    val user_id: Int,
+    val email: String,
+    val password: String
+
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/enotes/models/response/RegisterResponse.kt b/app/src/main/java/com/example/enotes/models/response/RegisterResponse.kt
new file mode 100644
index 0000000..84614af
--- /dev/null
+++ b/app/src/main/java/com/example/enotes/models/response/RegisterResponse.kt
@@ -0,0 +1,8 @@
+package com.example.enotes.models.response
+
+data class RegisterResponse (
+    val user_id: Int,
+    val name:String,
+    val email: String,
+    val password: String
+)
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/close.png b/app/src/main/res/drawable-v24/close.png
new file mode 100644
index 0000000..17f74c9
Binary files /dev/null and b/app/src/main/res/drawable-v24/close.png differ
diff --git a/app/src/main/res/drawable-v24/txt_color_24.xml b/app/src/main/res/drawable-v24/txt_color_24.xml
new file mode 100644
index 0000000..565ba55
--- /dev/null
+++ b/app/src/main/res/drawable-v24/txt_color_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M22,24H2v-4h20V24zM13.06,5.19l3.75,3.75L7.75,18H4v-3.75L13.06,5.19zM17.88,7.87l-3.75,-3.75l1.83,-1.83c0.39,-0.39 1.02,-0.39 1.41,0l2.34,2.34c0.39,0.39 0.39,1.02 0,1.41L17.88,7.87z"/>
+</vector>
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
new file mode 100644
index 0000000..31e7df2
--- /dev/null
+++ b/app/src/main/res/drawable/back.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" 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/drawable/done_24.xml b/app/src/main/res/drawable/done_24.xml
index 25e5251..2728880 100644
--- a/app/src/main/res/drawable/done_24.xml
+++ b/app/src/main/res/drawable/done_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="#FFFFFF"
     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="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000..70db409
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/image_24.xml b/app/src/main/res/drawable/image_24.xml
new file mode 100644
index 0000000..d35859d
--- /dev/null
+++ b/app/src/main/res/drawable/image_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 6da3691..4d9da86 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -9,14 +9,13 @@
     tools:context=".Login">
 
     <LinearLayout
+        android:id="@+id/layout"
         android:layout_width="350dp"
         android:layout_height="450dp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="100dp"
         android:background="@color/white"
-        android:orientation="vertical"
-        android:id="@+id/layout"
-        >
+        android:orientation="vertical">
 
 
         <TextView
@@ -30,24 +29,25 @@
             android:textSize="55sp">
 
         </TextView>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Email"
             android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
             android:layout_marginTop="20dp"
-            android:textColor="@color/black"
-            >
+            android:layout_marginRight="20dp"
+            android:text="Email"
+            android:textColor="@color/black">
 
         </TextView>
+
         <EditText
             android:id="@+id/email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="abc@xyz.com"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
+            android:hint="abc@xyz.com"
             android:textColor="@color/black"
 
             >
@@ -57,11 +57,10 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Password"
             android:layout_marginLeft="20dp"
             android:layout_marginTop="10dp"
-            android:textColor="@color/black"
-            >
+            android:text="Password"
+            android:textColor="@color/black">
 
         </TextView>
 
@@ -69,10 +68,10 @@
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="abc@xyz.com"
-            android:textColor="@color/black"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
+            android:hint="abc@xyz.com"
+            android:textColor="@color/black"
 
             >
 
@@ -82,25 +81,15 @@
             android:id="@+id/login_btn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
             android:background="@drawable/round_button"
-            android:textColor="@color/white"
             android:text="Log In"
-            android:layout_marginTop="50dp"
             android:textAllCaps="false"
-            >
+            android:textColor="@color/white">
+
         </Button>
 
 
-        <TextView
-            android:id="@+id/forget_password"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="forget password ?"
-            android:gravity="end"
-            android:layout_gravity="end"
-            android:textColor="@android:color/black">
-
-        </TextView>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c1ca715..a5827e8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,7 +17,7 @@
         android:id="@+id/layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="1dp">
+        >
 
         <RelativeLayout
             android:id="@+id/relative"
@@ -42,11 +42,12 @@
                 android:text="eNotes"
                 android:layout_centerHorizontal="true"
                 android:textColor="@color/white"
-                android:textSize="35sp">
+                android:textSize="25sp">
 
             </TextView>
 
         </RelativeLayout>
+
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/add_notes"
             android:layout_width="wrap_content"
@@ -57,6 +58,7 @@
             android:src="@drawable/ic_add"
             android:contentDescription="TODO" />
 
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/show_notes"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_open_image.xml b/app/src/main/res/layout/activity_open_image.xml
new file mode 100644
index 0000000..4a25085
--- /dev/null
+++ b/app/src/main/res/layout/activity_open_image.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    tools:context=".OpenImage">
+
+    <ImageView
+        android:id="@+id/go_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/back"
+        android:layout_margin="8dp"
+        android:padding="5dp"
+        >
+
+    </ImageView>
+
+    <ImageButton
+        android:id="@+id/imageview"
+        android:layout_width="match_parent"
+        android:layout_height="500dp"
+        android:scaleType="fitXY"
+        android:background="@color/white"
+        android:layout_centerInParent="true">
+
+    </ImageButton>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index e885b5b..9b04235 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -53,6 +53,30 @@
             >
 
         </EditText>
+     <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Email"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="10dp"
+            android:textColor="@color/black"
+            >
+
+        </TextView>
+        <EditText
+            android:id="@+id/email_address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="abc@xyz.com"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:textColor="@color/black"
+
+            >
+
+        </EditText>
+
 
 
         <TextView
diff --git a/app/src/main/res/layout/activity_text_note.xml b/app/src/main/res/layout/activity_text_note.xml
index 02fdfbd..4c52cc0 100644
--- a/app/src/main/res/layout/activity_text_note.xml
+++ b/app/src/main/res/layout/activity_text_note.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Text_note"
-    android:background="@color/grey">
+    android:background="@color/grey"
+    tools:context=".Text_note">
 
     <include
         android:id="@+id/included"
@@ -14,140 +13,67 @@
         android:layout_width="match_parent"
         android:layout_height="55dp" />
 
-    <LinearLayout
-        android:id="@+id/linear"
-        android:layout_marginTop="8dp"
-        android:layout_below="@id/included"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/white"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-
-        <ImageButton
-            android:id="@+id/fileupload"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:layout_marginStart="5dp"
-            android:src="@drawable/ic_baseline_attach_file_24"
-
-            >
-
-        </ImageButton>
-
-        <ImageButton
-            android:id="@+id/bgcolor"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/ic_baseline_color_lens_24">
-
-        </ImageButton>
-
-        <ImageButton
-            android:id="@+id/fontcolor"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp" android:src="@drawable/ic_baseline_color_lens_24">
-
-        </ImageButton>
-
-        <ImageButton
-            android:id="@+id/textsize"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/ic_baseline_format_size_24">
-
-        </ImageButton>
-
-        <ImageButton
-            android:id="@+id/textfont"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/ic_baseline_font_download_24">
-
-        </ImageButton>
-
-        <ImageButton
-            android:id="@+id/my_location"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/ic_baseline_location_on_24">
-
-        </ImageButton>
-        <ImageButton
-            android:id="@+id/my_sketch"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/create_24">
-
-        </ImageButton>
-
-  <ImageButton
-            android:id="@+id/my_bookmark"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@color/orange"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/bookmark">
-
-        </ImageButton>
-
-
-    </LinearLayout>
 
     <androidx.cardview.widget.CardView
         android:id="@+id/card1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/linear"
+        android:layout_below="@id/included"
+        android:layout_margin="10dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:layout_marginBottom="10dp"
         android:elevation="10dp">
 
-        <EditText
-            android:id="@+id/text_title"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="5dp"
-            android:hint="Title"
-            android:padding="1dp"
+            android:layout_height="45dp">
+            <EditText
+                android:id="@+id/text_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:layout_centerVertical="true"
+                android:hint="Title"
+                android:padding="1dp"
+                android:layout_marginTop="4dp"
+                android:background="@android:color/transparent"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold">
+
+            </EditText>
+
+            <ImageView
+                android:id="@+id/bookmark"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="5dp"
+                android:src="@drawable/bookmark">
+
+            </ImageView>
+        </RelativeLayout>
 
-            android:textColor="@color/black"
-            android:textSize="25sp"
-            android:textStyle="bold">
 
-        </EditText>
     </androidx.cardview.widget.CardView>
 
 
     <androidx.cardview.widget.CardView
         android:id="@+id/card2"
-        android:layout_below="@id/card1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:elevation="10dp"
+        android:layout_below="@id/card1"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
+        android:layout_marginBottom="12dp"
+
+        android:elevation="10dp">
 
-        android:layout_marginBottom="12dp">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -159,6 +85,8 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="5dp"
+                android:background="@android:color/transparent"
+
                 android:layout_marginBottom="5dp"
                 android:hint="content"
                 android:padding="1dp"
@@ -167,18 +95,6 @@
 
             </EditText>
 
-            <ImageView
-                android:id="@+id/bookmark"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="5dp"
-                android:layout_marginBottom="5dp"
-                android:src="@drawable/bookmark">
-
-            </ImageView>
 
             <ScrollView
                 android:id="@+id/scroll"
@@ -225,34 +141,171 @@
                         android:id="@+id/alarm_tv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_margin="8dp"
+                        android:gravity="end"
                         android:text="add reminder"
                         android:textSize="10sp">
 
                     </TextView>
 
-                    <ImageView
-                        android:id="@+id/image"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp">
 
-                    </ImageView>
                 </LinearLayout>
             </ScrollView>
-            <Button
-                android:id="@+id/done"
+
+
+            <LinearLayout
+                android:id="@+id/fab_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="done"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true">
+                android:orientation="vertical"
+                android:padding="5dp">
 
-            </Button>
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/my_bookmark"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/bookmark"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/my_sketch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/create_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/my_location"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/ic_baseline_location_on_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/textfont"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/ic_baseline_font_download_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/textsize"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/ic_baseline_format_size_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/fontcolor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/txt_color_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/bgcolor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/ic_baseline_color_lens_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/img_upload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:padding="4dp"
+                    android:src="@drawable/image_24"
+                    android:visibility="gone"
+                    app:backgroundTint="@color/orange"
+                    app:fabSize="mini"
+                    app:tint="@color/white" />
+
+                <!--on below line we are creating a settings fab
+                        and setting its visibility to gone-->
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/idFABAdd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:background="@color/orange"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/ic_add"
+                    app:backgroundTint="@color/orange"
+                    app:tint="@color/white" />
 
-        </RelativeLayout>
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/done"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:layout_margin="8dp"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/done_24"
+                    android:visibility="visible">
+
+                </com.google.android.material.floatingactionbutton.FloatingActionButton>
 
+            </LinearLayout>
+
+
+        </RelativeLayout>
 
 
     </androidx.cardview.widget.CardView>
 
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_view_notes.xml b/app/src/main/res/layout/activity_view_notes.xml
index 42b19c9..94bd7ee 100644
--- a/app/src/main/res/layout/activity_view_notes.xml
+++ b/app/src/main/res/layout/activity_view_notes.xml
@@ -106,13 +106,47 @@
                         tools:spanCount="2">
 
                     </androidx.recyclerview.widget.RecyclerView>
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+    <TextView
+        android:id="@+id/viewAddress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="address"
+        >
+
+    </TextView>
+
+    <ImageView
+        android:id="@+id/edit_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/create_24"
+        android:background="@color/orange"
+        android:visibility="gone"
+        android:layout_alignParentRight="true">
+
+    </ImageView>
+
+</RelativeLayout>
+                    <TextView
+                        android:id="@+id/view_reminders"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="add reminder"
+                        android:textSize="10sp">
+
+                    </TextView>
+
                 </LinearLayout>
             </ScrollView>
 
 
 
             <Button
-                android:id="@+id/done"
+                android:id="@+id/view_done"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="done"
@@ -120,13 +154,14 @@
                 android:layout_alignParentEnd="true">
 
             </Button>
+
             <Button
                 android:id="@+id/update"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Update"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true">
+                android:text="Edit">
 
             </Button>
 
diff --git a/app/src/main/res/layout/file_attach.xml b/app/src/main/res/layout/file_attach.xml
index cf8fe69..8f94e1b 100644
--- a/app/src/main/res/layout/file_attach.xml
+++ b/app/src/main/res/layout/file_attach.xml
@@ -2,41 +2,27 @@
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/img_card"
     android:layout_width="100dp"
     android:layout_margin="10dp"
     android:layout_height="100dp"
-    android:elevation="15dp">
+    android:elevation="5dp">
 
 
     <RelativeLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/attach_file"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
-        android:layout_margin="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:src="@drawable/attach_file_24"
         >
 
 
     </ImageView>
 
-    <TextView
-        android:id="@+id/file_name2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-         android:text="file Name"
-        android:layout_below="@id/attach_file"
-        android:layout_centerHorizontal="true"
-        android:textSize="10sp"
-
-        >
-
-    </TextView>
-
     </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout/itemview_show_notes.xml b/app/src/main/res/layout/itemview_show_notes.xml
index a334d5e..e76ed85 100644
--- a/app/src/main/res/layout/itemview_show_notes.xml
+++ b/app/src/main/res/layout/itemview_show_notes.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
     android:id="@+id/card"
     android:layout_width="wrap_content"
     android:layout_height="170dp"
     android:layout_margin="10dp"
-    android:padding="10dp"
-    android:elevation="5dp"
     android:backgroundTint="@android:color/white"
-    app:cardCornerRadius="15dp"
-    >
+    android:elevation="5dp"
+    android:padding="10dp"
+    app:cardCornerRadius="15dp">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="180dp"
-        android:padding="5dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="5dp">
 
         <ImageView
             android:id="@+id/tags"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
             android:layout_marginEnd="15dp"
-            android:src="@drawable/bookmark_24">
+            android:src="@drawable/bookmark_24"
+            app:layout_constraintBottom_toBottomOf="@id/note_tittle"
+            app:layout_constraintLeft_toRightOf="@id/note_tittle"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
         </ImageView>
 
@@ -37,19 +38,27 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_marginEnd="15dp"
-            android:src="@drawable/delete_24">
+            android:src="@drawable/close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
 
         </ImageView>
 
         <TextView
             android:id="@+id/note_tittle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
+            android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
-            android:text="Tittle"
+            android:layout_toRightOf="@id/tags"
+            android:lines="1"
+            android:text="TitleTitle"
             android:textColor="@color/black"
-            android:textSize="22sp">
+            android:textSize="15sp"
+            app:layout_constraintEnd_toStartOf="@id/tags"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
         </TextView>
 
@@ -58,10 +67,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/note_tittle"
-            android:layout_marginLeft="12dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
+            android:layout_marginEnd="8dp"
             android:text="content"
-            android:textSize="18sp">
+            android:textSize="13sp"
+            app:layout_constraintBottom_toTopOf="@id/note_date"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/note_date"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/note_tittle">
 
         </TextView>
 
@@ -69,15 +84,17 @@
             android:id="@+id/note_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             android:layout_marginLeft="12dp"
             android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
             android:text="dd/mm/yy"
             android:textColor="@android:color/darker_gray"
-            android:textSize="12sp">
+            android:textSize="10sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+
+            >
 
         </TextView>
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xml
index 0b41973..8351bba 100644
--- a/app/src/main/res/menu/navigation_menu.xml
+++ b/app/src/main/res/menu/navigation_menu.xml
@@ -1,19 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:showIn="navigation_view"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:showIn="navigation_view">
 
     <item android:title="NOTES">
 
         <menu>
             <item
                 android:id="@+id/nav_allnotes"
-                android:title="All Notes" />
+                android:title="All Notes"
+                />
 
             <item
-                android:id="@+id/nav_reminders"
-                android:title="Reminders" />
+                android:id="@+id/nav_travel"
+                android:title="Travel"
+                android:icon="@drawable/bookmark_blue"
+
+            />
+
+   <item
+                android:id="@+id/nav_peronal"
+                android:title="Personal"
+                android:icon="@drawable/bookmark_grren"
+       />
+   <item
+                android:id="@+id/nav_birthdays"
+                android:title="Birthdays"
+                android:icon="@drawable/bookmark_orage"/>
+   <item
+                android:id="@+id/nav_life"
+                android:title="Life"
+                android:icon="@drawable/bookmark_yellow"/>
+   <item
+                android:id="@+id/nav_work"
+                android:title="Work"
+                android:icon="@drawable/bookmark_red"/>
+   <item
+                android:id="@+id/nav_untag"
+                android:title="Untag"
+                android:icon="@drawable/bookmark_border_24"/>
 
 
         </menu>
@@ -27,9 +53,6 @@
               android:id="@+id/nav_account"
               android:title="My Account" />
 
-          <item
-              android:id="@+id/nav_settings"
-              android:title="Settings" />
 
           <item
               android:id="@+id/nav_logout"
diff --git a/build.gradle b/build.gradle
index da9843d..4070875 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,8 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 
+
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file