From e943ac46f3d615c706b5c50304e6ba2f565c94e0 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 16:00:59 +0100
Subject: [PATCH 1/6] fix: remove image name in Image database

---
 .../3.json                                    | 322 ++++++++++++++++++
 .../com/mshdabiola/database/NoteDatabase.kt   |  14 +-
 .../database/model/NoteImageEntity.kt         |   5 +-
 .../designsystem/component/NoteCard.kt        |   2 +-
 .../component/state/NoteImageUiState.kt       |   6 +-
 .../component/state/NotePadUiState.kt         |   7 +-
 .../java/com/mshdabiola/model/NoteImage.kt    |   1 -
 .../com/mshdabiola/worker/work/SaveWorker.kt  |   2 +-
 .../com/mshdabiola/editscreen/EditScreen.kt   |   6 +-
 .../mshdabiola/editscreen/EditViewModel.kt    |  28 +-
 .../editscreen/component/ShareViewModel.kt    |   2 +-
 .../com/mshdabiola/gallery/GalleryScreen.kt   |  12 +-
 .../mshdabiola/gallery/GalleryViewModel.kt    |   5 +-
 .../mshdabiola/mainscreen/MainViewModel.kt    |   8 +-
 .../searchscreen/SearchViewModel.kt           |   6 +-
 15 files changed, 381 insertions(+), 45 deletions(-)
 create mode 100644 core/database/schemas/com.mshdabiola.database.NoteDatabase/3.json

diff --git a/core/database/schemas/com.mshdabiola.database.NoteDatabase/3.json b/core/database/schemas/com.mshdabiola.database.NoteDatabase/3.json
new file mode 100644
index 00000000..9492f633
--- /dev/null
+++ b/core/database/schemas/com.mshdabiola.database.NoteDatabase/3.json
@@ -0,0 +1,322 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "8a44b7a696de82b667d9efea96f5377f",
+    "entities": [
+      {
+        "tableName": "note_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT NOT NULL, `detail` TEXT NOT NULL, `editDate` INTEGER NOT NULL, `isCheck` INTEGER NOT NULL, `color` INTEGER NOT NULL, `background` INTEGER NOT NULL, `isPin` INTEGER NOT NULL, `reminder` INTEGER NOT NULL, `interval` INTEGER NOT NULL, `noteType` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "detail",
+            "columnName": "detail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "editDate",
+            "columnName": "editDate",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCheck",
+            "columnName": "isCheck",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "background",
+            "columnName": "background",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPin",
+            "columnName": "isPin",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reminder",
+            "columnName": "reminder",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interval",
+            "columnName": "interval",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteType",
+            "columnName": "noteType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "note_voice_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `voiceName` TEXT NOT NULL, PRIMARY KEY(`id`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "voiceName",
+            "columnName": "voiceName",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "noteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "note_image_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `isDrawing` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDrawing",
+            "columnName": "isDrawing",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "noteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "note_check_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `content` TEXT NOT NULL, `isCheck` INTEGER NOT NULL, PRIMARY KEY(`id`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCheck",
+            "columnName": "isCheck",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "noteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "note_label_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`noteId` INTEGER NOT NULL, `labelId` INTEGER NOT NULL, PRIMARY KEY(`noteId`, `labelId`))",
+        "fields": [
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labelId",
+            "columnName": "labelId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "noteId",
+            "labelId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "label_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "path_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`imageId` INTEGER NOT NULL, `pathId` INTEGER NOT NULL, `color` INTEGER NOT NULL, `width` INTEGER NOT NULL, `join` INTEGER NOT NULL, `alpha` REAL NOT NULL, `cap` INTEGER NOT NULL, `paths` TEXT NOT NULL, PRIMARY KEY(`imageId`, `pathId`))",
+        "fields": [
+          {
+            "fieldPath": "imageId",
+            "columnName": "imageId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pathId",
+            "columnName": "pathId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "width",
+            "columnName": "width",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "join",
+            "columnName": "join",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alpha",
+            "columnName": "alpha",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cap",
+            "columnName": "cap",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paths",
+            "columnName": "paths",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "imageId",
+            "pathId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8a44b7a696de82b667d9efea96f5377f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/core/database/src/main/java/com/mshdabiola/database/NoteDatabase.kt b/core/database/src/main/java/com/mshdabiola/database/NoteDatabase.kt
index 3da23e25..04bd5370 100644
--- a/core/database/src/main/java/com/mshdabiola/database/NoteDatabase.kt
+++ b/core/database/src/main/java/com/mshdabiola/database/NoteDatabase.kt
@@ -2,7 +2,10 @@ package com.mshdabiola.database
 
 import androidx.room.AutoMigration
 import androidx.room.Database
+import androidx.room.DeleteColumn
+import androidx.room.DeleteTable
 import androidx.room.RoomDatabase
+import androidx.room.migration.AutoMigrationSpec
 import com.mshdabiola.database.dao.LabelDao
 import com.mshdabiola.database.dao.NoteCheckDao
 import com.mshdabiola.database.dao.NoteDao
@@ -29,10 +32,11 @@ import com.mshdabiola.database.model.NoteVoiceEntity
         LabelEntity::class,
         DrawPathEntity::class,
     ],
-    version = 2,
-    autoMigrations = [ AutoMigration(1,2)]
-
-
+    version = 3,
+    autoMigrations = [
+        AutoMigration(1,2),
+        AutoMigration(2 ,3,NoteDatabase.Migrate2to3::class)
+    ]
 )
 abstract class NoteDatabase : RoomDatabase() {
 
@@ -51,4 +55,6 @@ abstract class NoteDatabase : RoomDatabase() {
     abstract fun getNotePadDao(): NotepadDao
 
     abstract fun getPath(): PathDao
+    @DeleteColumn(tableName = "note_image_table", columnName = "imageName")
+    class Migrate2to3 : AutoMigrationSpec
 }
diff --git a/core/database/src/main/java/com/mshdabiola/database/model/NoteImageEntity.kt b/core/database/src/main/java/com/mshdabiola/database/model/NoteImageEntity.kt
index af2a9306..cd9133a8 100644
--- a/core/database/src/main/java/com/mshdabiola/database/model/NoteImageEntity.kt
+++ b/core/database/src/main/java/com/mshdabiola/database/model/NoteImageEntity.kt
@@ -12,11 +12,10 @@ import java.sql.Timestamp
 data class NoteImageEntity(
     val id: Long,
     val noteId: Long,
-    val imageName: String,
     val isDrawing: Boolean,
     @ColumnInfo(defaultValue = "0")
     val timestamp: Long
 )
 
-fun NoteImage.toNoteImageEntity() = NoteImageEntity(id, noteId, imageName, isDrawing,timestamp)
-fun NoteImageEntity.toNoteImage() = NoteImage(id, noteId, imageName, isDrawing,timestamp)
+fun NoteImage.toNoteImageEntity() = NoteImageEntity(id, noteId, isDrawing,timestamp)
+fun NoteImageEntity.toNoteImage() = NoteImage(id, noteId,isDrawing,timestamp)
diff --git a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NoteCard.kt b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NoteCard.kt
index ac0c3712..e4df7ff5 100644
--- a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NoteCard.kt
+++ b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NoteCard.kt
@@ -134,7 +134,7 @@ fun NoteCard(
                                     modifier = Modifier
                                         .weight(1f)
                                         .height(100.dp),
-                                    model = it.imageName,
+                                    model = it.path,
                                     contentDescription = "",
                                     contentScale = ContentScale.Crop,
                                 )
diff --git a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NoteImageUiState.kt b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NoteImageUiState.kt
index 3038d03b..fdc4d711 100644
--- a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NoteImageUiState.kt
+++ b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NoteImageUiState.kt
@@ -5,11 +5,11 @@ import com.mshdabiola.model.NoteImage
 data class NoteImageUiState(
     val id: Long,
     val noteId: Long,
-    val imageName: String,
+    val path: String,
     val isDrawing: Boolean,
     val timestamp: Long=0
 )
 
-fun NoteImage.toNoteImageUiState() = NoteImageUiState(id, noteId, imageName, isDrawing,timestamp)
+fun NoteImage.toNoteImageUiState(toPath:(Long)->String) = NoteImageUiState(id, noteId, toPath(id), isDrawing,timestamp)
 
-fun NoteImageUiState.toNoteImage() = NoteImage(id, noteId, imageName, isDrawing,timestamp)
+fun NoteImageUiState.toNoteImage() = NoteImage(id, noteId,  isDrawing,timestamp)
diff --git a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NotePadUiState.kt b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NotePadUiState.kt
index 5597a33e..218241f1 100644
--- a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NotePadUiState.kt
+++ b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/state/NotePadUiState.kt
@@ -51,9 +51,12 @@ data class NotePadUiState(
     }
 }
 
-fun NotePad.toNotePadUiState(list: List<Label> = emptyList(),getTime:(Long)->String) = NotePadUiState(
+fun NotePad.toNotePadUiState(list: List<Label> = emptyList(),
+                             getTime:(Long)->String,
+                             toPath:(Long)->String
+                             ) = NotePadUiState(
     note = note.toNoteUiState(getDate=getTime),
-    images = images.map { it.toNoteImageUiState() }.toImmutableList(),
+    images = images.map { it.toNoteImageUiState(toPath) }.toImmutableList(),
     voices = voices.map { it.toNoteVoiceUiState() }.toImmutableList(),
     checks = checks.map { it.toNoteCheckUiState() }.toImmutableList(),
     labels = labels.map { s -> list.singleOrNull { it.id == s.labelId }?.label ?: "" }
diff --git a/core/model/src/main/java/com/mshdabiola/model/NoteImage.kt b/core/model/src/main/java/com/mshdabiola/model/NoteImage.kt
index 7522fcc0..09bfb9ed 100644
--- a/core/model/src/main/java/com/mshdabiola/model/NoteImage.kt
+++ b/core/model/src/main/java/com/mshdabiola/model/NoteImage.kt
@@ -5,7 +5,6 @@ import java.sql.Timestamp
 data class NoteImage(
     val id: Long,
     val noteId: Long,
-    val imageName: String,
     val isDrawing: Boolean,
     val timestamp: Long=0
 )
diff --git a/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt b/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
index 0279323b..f68c2074 100644
--- a/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
+++ b/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
@@ -72,7 +72,7 @@ class SaveWorker @AssistedInject constructor(
         noteImageRepository.delete(imageId)
         File(contentManager.getImagePath(imageId)).deleteOnExit()
     } else {
-        noteImageRepository.upsert(NoteImage(imageId, noteId,path, isDrawing = true, timestamp = System.currentTimeMillis()))
+        noteImageRepository.upsert(NoteImage(imageId, noteId, isDrawing = true, timestamp = System.currentTimeMillis()))
         drawingPathRepository.delete(imageId)
         drawingPathRepository.insert(drawPathList)
     }
diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
index 6ab4783a..cc74e74a 100644
--- a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
+++ b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
@@ -457,7 +457,7 @@ fun EditScreen(
                                             }
                                             .weight(1f)
                                             .height(200.dp),
-                                        model = it.imageName,
+                                        model = it.path,
                                         contentDescription = "note image",
                                         contentScale = ContentScale.Crop,
                                     )
@@ -727,13 +727,13 @@ fun EditScreenPreview() {
                 NoteImageUiState(
                     id = 7898L,
                     noteId = 9313L,
-                    imageName = "",
+                    path = "",
                     isDrawing = false,
                 ),
                 NoteImageUiState(
                     id = 34L,
                     noteId = 9513L,
-                    imageName = "",
+                    path = "",
                     isDrawing = false,
                 ),
             ).toImmutableList(),
diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
index aded0af6..696e194c 100644
--- a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
+++ b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
@@ -87,7 +87,7 @@ class EditViewModel @Inject constructor(
 ) : ViewModel() {
 
     private val editArg = EditArg(savedStateHandle)
-    var notePadUiState by mutableStateOf(NotePad().toNotePadUiState(getTime = dateShortStringUsercase::invoke))
+    var notePadUiState by mutableStateOf(NotePad().toNotePadUiState(getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath))
     var navigateToDrawing by mutableStateOf(false)
 
 
@@ -129,7 +129,7 @@ class EditViewModel @Inject constructor(
                             NoteImageUiState(
                                 id = getNewId(),
                                 noteId = notePad.note.id,
-                                imageName = contentManager.getImagePath(editArg.data),
+                                path = contentManager.getImagePath(editArg.data),
                                 isDrawing = false,
                             ),
                         )
@@ -167,13 +167,13 @@ class EditViewModel @Inject constructor(
                     val notePad = notePadRepository
                         .getOneNotePad(editArg.id)
                         .first()
-                        .toNotePadUiState(labels, getTime = dateShortStringUsercase::invoke)
+                        .toNotePadUiState(labels, getTime = dateShortStringUsercase::invoke,contentManager::getImagePath)
                     val voices =
                         notePad.voices.map { it.copy(length = getAudioLength(it.voiceName)) }
                     val data = editArg.content
                     val notePadUiState=notePad.copy(voices = voices.toImmutableList())
                     if (data == "extract") {
-                        onImage(editArg.data.toInt(),notePadUiState)
+                        onImage(contentManager.getImagePath(editArg.data),notePadUiState)
                         notePadUiState
                     }else{
                         notePadUiState
@@ -199,7 +199,7 @@ class EditViewModel @Inject constructor(
                     val strLabel = pair.second.map { s ->
                         labels.singleOrNull { it.id == s.labelId }?.label ?: ""
                     }
-                    val image = pair.first.map { it.toNoteImageUiState() }
+                    val image = pair.first.map { it.toNoteImageUiState(contentManager::getImagePath) }
 
                     notePadUiState = notePadUiState.copy(
                         labels = strLabel.toImmutableList(),
@@ -350,9 +350,9 @@ class EditViewModel @Inject constructor(
         contentManager.saveImage(uri, id)
 
         val noteImage =
-            NoteImage(id, notePadUiState.note.id, contentManager.getImagePath(id), false)
+            NoteImage(id, notePadUiState.note.id, false)
         val listImage = notePadUiState.images.toMutableList()
-        listImage.add(noteImage.toNoteImageUiState())
+        listImage.add(noteImage.toNoteImageUiState(contentManager::getImagePath))
 
         notePadUiState = notePadUiState.copy(images = listImage.toImmutableList())
     }
@@ -377,11 +377,10 @@ class EditViewModel @Inject constructor(
             NoteImage(
                 photoId,
                 notePadUiState.note.id,
-                contentManager.getImagePath(photoId),
                 false,
             )
         val listImage = notePadUiState.images.toMutableList()
-        listImage.add(noteImage.toNoteImageUiState())
+        listImage.add(noteImage.toNoteImageUiState(contentManager::getImagePath))
 
         notePadUiState = notePadUiState.copy(images = listImage.toImmutableList())
     }
@@ -533,11 +532,16 @@ class EditViewModel @Inject constructor(
         }
     }
 
-    private fun onImage(index: Int,notePad: NotePadUiState) {
+    private fun onImage(path: String,notePad: NotePadUiState) {
         viewModelScope.launch {
             try {
-                val image = notePad.images[index]
-                val text = imageToText.toText(image.imageName)
+               // val image = notePad.images[index]
+                val text = try {
+                    imageToText.toText(path)
+                }catch (e:Exception){
+                    e.printStackTrace()
+                    ""
+                }
                 val note = notePad.note
                 notePadUiState = notePadUiState.copy(note = note.copy(detail = "${note.detail}\n$text"))
             }catch (e:Exception){
diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/component/ShareViewModel.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/component/ShareViewModel.kt
index 9e48ff3e..bd563f17 100644
--- a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/component/ShareViewModel.kt
+++ b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/component/ShareViewModel.kt
@@ -81,7 +81,7 @@ class ShareViewModel @Inject constructor(
                     val time = System.currentTimeMillis()
                     contentManager.saveImage(it, time)
                     val path = contentManager.getImagePath(time)
-                    NoteImage(time, noteId, path, isDrawing = false)
+                    NoteImage(time, noteId,  isDrawing = false)
                 }
             val labels = selectLabels
                 .map { NoteLabel(noteId, it.id) }
diff --git a/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryScreen.kt b/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryScreen.kt
index 9e191687..444a8e74 100644
--- a/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryScreen.kt
+++ b/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryScreen.kt
@@ -56,7 +56,7 @@ fun GalleryScreen(
         onDelete = viewModel::deleteImage,
         onToText = {
             val id = galleryUiState.value.images[0].noteId
-            navigateToEditScreen(id, "extract", it.toLong())
+            navigateToEditScreen(id, "extract", it)
         },
     )
 }
@@ -67,7 +67,7 @@ fun GalleryScreen(
     galleryUiState: GalleryUiState,
     onBack: () -> Unit = {},
     onDelete: (Long) -> Unit = {},
-    onToText: (Int) -> Unit = {},
+    onToText: (Long) -> Unit = {},
 ) {
     val pagerState = rememberPagerState()
 //    var currIndex = remember(pagerState.currentPage) {
@@ -84,7 +84,7 @@ fun GalleryScreen(
         val index = pagerState.currentPage
         val image = galleryUiState.images[index]
 
-        val file = File(image.imageName)
+        val file = File(image.path)
         val uri = FileProvider.getUriForFile(context, context.packageName + ".provider", file)
         val intent = ShareCompat.IntentBuilder(context)
             .setType("image/*")
@@ -97,7 +97,7 @@ fun GalleryScreen(
     val onCopy = {
         val index = pagerState.currentPage
         val image = galleryUiState.images[index]
-        val file = File(image.imageName)
+        val file = File(image.path)
         val uri = FileProvider.getUriForFile(context, context.packageName + ".provider", file)
 
         val content = context.contentResolver
@@ -116,7 +116,7 @@ fun GalleryScreen(
             GalleryTopAppBar(
                 onBack = onBack,
                 onDelete = delete,
-                onGrabText = { onToText(pagerState.currentPage) },
+                onGrabText = { onToText(galleryUiState.images[pagerState.currentPage].id) },
                 name = "${pagerState.currentPage + 1} of ${galleryUiState.images.size}",
                 onSend = onSend,
                 onCopy = onCopy,
@@ -134,7 +134,7 @@ fun GalleryScreen(
                 // / currIndex=it
                 AsyncImage(
                     modifier = Modifier.fillMaxSize(),
-                    model = image.imageName,
+                    model = image.path,
                     contentDescription = "",
                     alignment = Alignment.Center,
 
diff --git a/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryViewModel.kt b/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryViewModel.kt
index 31fb8ac4..4627b3f8 100644
--- a/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryViewModel.kt
+++ b/feature/gallery/src/main/java/com/mshdabiola/gallery/GalleryViewModel.kt
@@ -3,6 +3,7 @@ package com.mshdabiola.gallery
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.mshdabiola.common.ContentManager
 import com.mshdabiola.database.repository.NoteImageRepository
 import com.mshdabiola.designsystem.component.state.toNoteImageUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -10,7 +11,6 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -19,6 +19,7 @@ import javax.inject.Inject
 class GalleryViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val noteImageRepository: NoteImageRepository,
+    private val contentManager: ContentManager
 ) : ViewModel() {
 
     private val id = savedStateHandle.get<Long>(noteIdStr)!!
@@ -39,7 +40,7 @@ class GalleryViewModel @Inject constructor(
                         .copy(
                             images =
                             reverseImages.map {
-                                it.toNoteImageUiState()
+                                it.toNoteImageUiState(contentManager::getImagePath)
                             }.toImmutableList(),
                             currentIndex = index,
                         )
diff --git a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
index 09a0b59b..cf04cb23 100644
--- a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
+++ b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
@@ -92,7 +92,7 @@ class MainViewModel
                         NoteType.LABEL -> {
                             notepadRepository.getNotePads().map { notes ->
                                 notes.filter { it -> it.labels.any { it.labelId == (pair.second).id } }
-                                    .map { it.toNotePadUiState(pair.first, getTime = dateShortStringUsercase::invoke) }
+                                    .map { it.toNotePadUiState(pair.first, getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath) }
                             }.collect { padUiStateList ->
                                 val list = padUiStateList.map {
                                     val labels = it.labels
@@ -110,7 +110,7 @@ class MainViewModel
 
                         NoteType.REMAINDER -> {
                             notepadRepository.getNotePads().map { notes ->
-                                notes.map { it.toNotePadUiState(pair.first,getTime = dateShortStringUsercase::invoke) }
+                                notes.map { it.toNotePadUiState(pair.first,getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath) }
                             }.collect { padUiStateList ->
                                 val list = padUiStateList.filter { it.note.reminder > 0 }.map {
                                     val labels = it.labels
@@ -128,7 +128,7 @@ class MainViewModel
 
                         else -> {
                             notepadRepository.getNotePads(pair.second.type).map { notes ->
-                                notes.map { it.toNotePadUiState(pair.first, getTime = dateShortStringUsercase::invoke) }
+                                notes.map { it.toNotePadUiState(pair.first, getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath) }
                             }.collect { padUiStateList ->
                                 val list = padUiStateList.map {
                                     val labels = it.labels
@@ -360,7 +360,7 @@ class MainViewModel
             val emptyList = notepadRepository
                 .getNotePads()
                 .first()
-                .map { it.toNotePadUiState(getTime = dateShortStringUsercase::invoke) }
+                .map { it.toNotePadUiState(getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath) }
                 .filter { it.isEmpty() }
 
             if (emptyList.isNotEmpty()) {
diff --git a/feature/searchscreen/src/main/java/com/mshdabiola/searchscreen/SearchViewModel.kt b/feature/searchscreen/src/main/java/com/mshdabiola/searchscreen/SearchViewModel.kt
index ca267699..9ec6a982 100644
--- a/feature/searchscreen/src/main/java/com/mshdabiola/searchscreen/SearchViewModel.kt
+++ b/feature/searchscreen/src/main/java/com/mshdabiola/searchscreen/SearchViewModel.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.mshdabiola.common.ContentManager
 import com.mshdabiola.common.DateShortStringUsercase
 import com.mshdabiola.database.repository.LabelRepository
 import com.mshdabiola.database.repository.NotePadRepository
@@ -25,7 +26,8 @@ import javax.inject.Inject
 class SearchViewModel @Inject constructor(
     private val notePadRepository: NotePadRepository,
     private val labelRepository: LabelRepository,
-    private val dateShortStringUsercase: DateShortStringUsercase
+    private val dateShortStringUsercase: DateShortStringUsercase,
+    private val contentManager: ContentManager
 ) : ViewModel() {
 
     var searchUiState by mutableStateOf(SearchUiState())
@@ -40,7 +42,7 @@ class SearchViewModel @Inject constructor(
                     notePads = pads.map { it ->
                         val labels =
                             it.labels.map { notelab -> lab.single { it.id == notelab.labelId }.label }
-                        it.toNotePadUiState(getTime=dateShortStringUsercase::invoke).copy(labels = labels.toImmutableList())
+                        it.toNotePadUiState(getTime=dateShortStringUsercase::invoke, toPath = contentManager::getImagePath).copy(labels = labels.toImmutableList())
                     }
 
                     val labels = notePads

From b729b361dead6b4050597f4fab053b40838412b9 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 16:12:27 +0100
Subject: [PATCH 2/6] fix: delete worker data after use

---
 .../src/main/java/com/mshdabiola/common/ContentManager.kt  | 4 ++--
 .../src/main/java/com/mshdabiola/worker/work/SaveWorker.kt | 7 +++++--
 .../main/java/com/mshdabiola/drawing/DrawingViewModel.kt   | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt b/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt
index 9c2dbd6f..22a17348 100644
--- a/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt
+++ b/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt
@@ -75,12 +75,12 @@ class ContentManager
         }
     }
 
-    fun dataFile(): File {
+    fun dataFile(drawingId:Long): File {
         val dir = File(context.filesDir.absolutePath + "/drawingfile")
         if (dir.exists().not()) {
             dir.mkdir()
         }
 
-        return File(dir, "data.json")
+        return File(dir, "data_$drawingId.json")
     }
 }
diff --git a/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt b/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
index f68c2074..e36aa31d 100644
--- a/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
+++ b/core/worker/src/main/java/com/mshdabiola/worker/work/SaveWorker.kt
@@ -50,8 +50,10 @@ class SaveWorker @AssistedInject constructor(
         val imageId = workerParams.inputData.getLong(IMAGE_Id, 7)
         val noteId = workerParams.inputData.getLong(NOTE_ID, 7)
 
-        val file=contentManager.dataFile()
-
+        val file=contentManager.dataFile(imageId)
+        if (!file.exists()){
+            return@withContext Result.failure()
+        }
         val pathList =  Json.decodeFromStream<List<DrawPathPojo>>(file.inputStream())
 
         val drawPathList = pathList.map { it.toDrawPath() }
@@ -77,6 +79,7 @@ class SaveWorker @AssistedInject constructor(
         drawingPathRepository.insert(drawPathList)
     }
 
+        file.delete()
         Result.success()
     }
 
diff --git a/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingViewModel.kt b/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingViewModel.kt
index da2534a3..3992e3ee 100644
--- a/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingViewModel.kt
+++ b/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingViewModel.kt
@@ -62,11 +62,11 @@ class DrawingViewModel @Inject constructor(
         Saver.saveGame(imageId = imageID, noteId = noteId)
     }
 
-    suspend fun keepDataInFile(da :Map<PathData,List<Coordinate>>){
+    fun keepDataInFile(da :Map<PathData,List<Coordinate>>){
         val data = changeToDrawPath(da)
         val dataInText=Converter.pathToString(data)
         Log.e("drawing",dataInText)
-        contentManager.dataFile().writeText(dataInText)
+        contentManager.dataFile(imageID).writeText(dataInText)
     }
 
     fun deleteImage() {

From 0226d92c0a66b692ec09304ec445c6a2ab6a7819 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 20:32:20 +0100
Subject: [PATCH 3/6] feat: add timber and update app

---
 app/build.gradle.kts                          |  3 +++
 .../mshdabiola/playnotepad/MainActivity.kt    | 25 +++++++++++++++++++
 .../playnotepad/NotePadApplication.kt         |  7 ++++++
 .../kotlin/AndroidLibraryConventionPlugin.kt  |  4 +++
 gradle/libs.versions.toml                     |  8 +++++-
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0d6b686a..67de277a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -79,5 +79,8 @@ dependencies {
     //testImplementation (libs.junit4)
     //androidTestImplementation (libs.bundles.android.test.bundle)
     //debugImplementation (libs.bundles.compose.debug.bundle)
+    implementation(libs.timber)
+    implementation(libs.play.update)
+    implementation(libs.play.update.kts)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt b/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt
index 620fca56..c452868c 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt
@@ -7,6 +7,9 @@ import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSiz
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
 import com.mshdabiola.designsystem.theme.NotePadAppTheme
 import com.mshdabiola.playnotepad.ui.NotePadApp
 import dagger.hilt.android.AndroidEntryPoint
@@ -25,4 +28,26 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    override fun onStart() {
+        super.onStart()
+        val appUpdateInfoManager = AppUpdateManagerFactory.create(this)
+        val appUpdateInfoTask = appUpdateInfoManager.appUpdateInfo
+
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)
+            ) {
+                appUpdateInfoManager.startUpdateFlowForResult(
+                    appUpdateInfo,
+                    AppUpdateType.IMMEDIATE,
+                    this,
+                    343
+                )
+            }
+            //  log("update ${appUpdateInfo.packageName()} ${appUpdateInfo.availableVersionCode()}",)
+        }.addOnFailureListener {
+            it.printStackTrace()
+        }
+    }
 }
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt b/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt
index 26d700ad..d8045c68 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt
@@ -3,11 +3,18 @@ package com.mshdabiola.playnotepad
 import android.app.Application
 import com.mshdabiola.worker.Saver
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
 class NotePadApplication : Application(){
     override fun onCreate() {
         super.onCreate()
         Saver.initialize(applicationContext)
+
+        if (packageName.contains("debug")) {
+            Timber.plant(Timber.DebugTree())
+            Timber.e("log on app create")
+        }
     }
+
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index f7645193..e759fcf7 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -18,8 +18,10 @@ import com.android.build.gradle.LibraryExtension
 import com.mshdabiola.app.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryConventionPlugin : Plugin<Project> {
@@ -49,9 +51,11 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 //                    force("org.objenesis:objenesis:2.6")
 //                }
 //            }
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
                 add("androidTestImplementation", kotlin("test"))
                 add("testImplementation", kotlin("test"))
+                add("implementation", libs.findLibrary("timber").get())
             }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a02ed93b..04c9efc5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -56,11 +56,13 @@ maneVersion = "0.44.0"
 okhttp = "4.10.0"
 protobuf = "3.21.12"
 protobufPlugin = "0.9.1"
+playReview = "2.0.1"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
 room = "2.5.1"
 secrets = "2.0.1"
 turbine = "0.8.0"
+timber = "5.0.1"
 
 [libraries]
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
@@ -134,13 +136,17 @@ lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
 protobuf-protoc = "com.google.protobuf:protoc:21.0-rc-1"
+play-review= {module = "com.google.android.play:review", version.ref="playReview"}
+play-review-kts= {module = "com.google.android.play:review-ktx", version.ref="playReview"}
+play-update= {module = "com.google.android.play:app-update", version.ref="playReview"}
+play-update-kts= {module = "com.google.android.play:app-update-ktx", version.ref="playReview"}
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-kotlin-serialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
-
+timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 [bundles]
 android-test-bundle = [
     "androidx-compose-ui-test",

From 68753957ee5e1f9a81d1eb23cbe104c3c44cf880 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 21:16:53 +0100
Subject: [PATCH 4/6] feat: add notification to app

---
 .../component/NotifySneackerUi.kt             | 33 +++++++++++++
 .../com/mshdabiola/editscreen/EditScreen.kt   | 14 ++++++
 .../mshdabiola/editscreen/EditViewModel.kt    | 48 +++++++++++++++++--
 .../com/mshdabiola/mainscreen/MainScreen.kt   | 28 ++---------
 .../mshdabiola/mainscreen/MainViewModel.kt    | 32 ++++++++-----
 5 files changed, 115 insertions(+), 40 deletions(-)
 create mode 100644 core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NotifySneackerUi.kt

diff --git a/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NotifySneackerUi.kt b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NotifySneackerUi.kt
new file mode 100644
index 00000000..9cabd208
--- /dev/null
+++ b/core/designsystem/src/main/java/com/mshdabiola/designsystem/component/NotifySneackerUi.kt
@@ -0,0 +1,33 @@
+package com.mshdabiola.designsystem.component
+
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import com.mshdabiola.designsystem.component.state.Notify
+import kotlinx.collections.immutable.ImmutableList
+
+
+@Composable
+fun NotifySnacker(snackHostState: SnackbarHostState, notifys: ImmutableList<Notify>) {
+    LaunchedEffect(key1 = notifys, block = {
+        if (notifys.isNotEmpty()) {
+            val first = notifys.first()
+            val result = snackHostState.showSnackbar(
+                message = first.message,
+                withDismissAction = first.withDismissAction,
+                actionLabel = first.label,
+                duration = if (first.isShort) SnackbarDuration.Short else SnackbarDuration.Long,
+            )
+            when (result) {
+                SnackbarResult.ActionPerformed -> {
+                }
+
+                SnackbarResult.Dismissed -> {
+                    first.callback()
+                }
+            }
+        }
+    })
+}
\ No newline at end of file
diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
index cc74e74a..b054c9fe 100644
--- a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
+++ b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditScreen.kt
@@ -59,6 +59,8 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -103,6 +105,7 @@ import coil.compose.AsyncImage
 import com.mshdabiola.designsystem.component.DateDialog
 import com.mshdabiola.designsystem.component.LabelCard
 import com.mshdabiola.designsystem.component.NotificationDialogNew
+import com.mshdabiola.designsystem.component.NotifySnacker
 import com.mshdabiola.designsystem.component.ReminderCard
 import com.mshdabiola.designsystem.component.TimeDialog
 import com.mshdabiola.designsystem.component.state.NoteCheckUiState
@@ -111,6 +114,7 @@ import com.mshdabiola.designsystem.component.state.NotePadUiState
 import com.mshdabiola.designsystem.component.state.NoteUiState
 import com.mshdabiola.designsystem.component.state.NoteUriState
 import com.mshdabiola.designsystem.component.state.NoteVoiceUiState
+import com.mshdabiola.designsystem.component.state.Notify
 import com.mshdabiola.designsystem.icon.NoteIcon
 import com.mshdabiola.editscreen.component.AddBottomSheet2
 import com.mshdabiola.editscreen.component.ColorAndImageBottomSheet
@@ -119,6 +123,7 @@ import com.mshdabiola.editscreen.component.NotificationBottomSheet
 import com.mshdabiola.firebase.FirebaseScreenLog
 import com.mshdabiola.model.NoteType
 import com.mshdabiola.searchscreen.FlowLayout2
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
@@ -136,6 +141,7 @@ fun EditScreen(
     navigateToDrawing: (Long, Long?) -> Unit,
 ) {
 
+    val messages=editViewModel.message.collectAsStateWithLifecycle()
     var showModalState by remember {
         mutableStateOf(false)
     }
@@ -173,6 +179,7 @@ fun EditScreen(
     FirebaseScreenLog(screen = "edit_screen")
     EditScreen(
         notepad = editViewModel.notePadUiState,
+        messages = messages.value,
         onTitleChange = editViewModel::onTitleChange,
         onSubjectChange = editViewModel::onDetailChange,
         onBackClick = onBack,
@@ -305,6 +312,7 @@ fun EditScreen(
 @Composable
 fun EditScreen(
     notepad: NotePadUiState,
+    messages : ImmutableList<Notify> = emptyList<Notify>().toImmutableList(),
     onTitleChange: (String) -> Unit = {},
     onSubjectChange: (String) -> Unit = {},
     onBackClick: () -> Unit = {},
@@ -373,6 +381,11 @@ fun EditScreen(
     val images = remember(notepad.images) {
         notepad.images.reversed().chunked(3)
     }
+    val snackbarHostState = remember {
+        SnackbarHostState()
+    }
+
+    NotifySnacker(snackHostState = snackbarHostState, notifys = messages)
 
     LaunchedEffect(key1 = notepad, block = {
         if (notepad.note.focus) {
@@ -424,6 +437,7 @@ fun EditScreen(
                 },
             )
         },
+        snackbarHost ={ SnackbarHost (snackbarHostState)}
 
         ) { paddingValues ->
         Column(
diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
index 696e194c..9f68c7de 100644
--- a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
+++ b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
@@ -35,6 +35,7 @@ import com.mshdabiola.designsystem.component.state.NoteTypeUi
 import com.mshdabiola.designsystem.component.state.NoteUiState
 import com.mshdabiola.designsystem.component.state.NoteUriState
 import com.mshdabiola.designsystem.component.state.NoteVoiceUiState
+import com.mshdabiola.designsystem.component.state.Notify
 import com.mshdabiola.designsystem.component.state.toNoteCheckUiState
 import com.mshdabiola.designsystem.component.state.toNoteImageUiState
 import com.mshdabiola.designsystem.component.state.toNotePad
@@ -44,6 +45,7 @@ import com.mshdabiola.model.NoteImage
 import com.mshdabiola.model.NotePad
 import com.mshdabiola.model.NoteType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -67,6 +69,7 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.plus
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
+import timber.log.Timber
 import javax.inject.Inject
 import kotlin.time.DurationUnit
 
@@ -89,6 +92,8 @@ class EditViewModel @Inject constructor(
     private val editArg = EditArg(savedStateHandle)
     var notePadUiState by mutableStateOf(NotePad().toNotePadUiState(getTime = dateShortStringUsercase::invoke, toPath = contentManager::getImagePath))
     var navigateToDrawing by mutableStateOf(false)
+    private val _messages = MutableStateFlow(emptyList<Notify>().toImmutableList())
+    val message = _messages.asStateFlow()
 
 
     private var photoId: Long = 0
@@ -437,6 +442,13 @@ class EditViewModel @Inject constructor(
     fun pinNote() {
         notePadUiState =
             notePadUiState.copy(note = notePadUiState.note.copy(isPin = !notePadUiState.note.isPin))
+
+        if (notePadUiState.note.isPin){
+            addNotify("Note is pinned")
+        }else{
+            addNotify("Note is not pinned")
+        }
+
     }
 
     fun onColorChange(index: Int) {
@@ -473,15 +485,18 @@ class EditViewModel @Inject constructor(
             val id = note.id
 
             alarmManager.deleteAlarm(id.toInt())
+            addNotify("Alarm deleted")
         }
     }
 
     fun onArchive() {
         notePadUiState = if (notePadUiState.note.noteType.type == NoteType.ARCHIVE) {
             val note = notePadUiState.note.copy(noteType = NoteTypeUi())
+            addNotify("Note archived")
             notePadUiState.copy(note = note)
         } else {
             val note = notePadUiState.note.copy(noteType = NoteTypeUi(NoteType.ARCHIVE))
+            addNotify("Note already archived")
             notePadUiState.copy(note = note)
         }
     }
@@ -508,6 +523,7 @@ class EditViewModel @Inject constructor(
             )
 
             notePadRepository.insertNotepad(copy)
+            addNotify("Note copied")
         }
     }
 
@@ -529,6 +545,8 @@ class EditViewModel @Inject constructor(
             notePadUiState = notePadUiState.copy(voices = voices.toImmutableList())
 
             noteVoiceRepository.delete(voice.id)
+
+            addNotify("Voice note deleted")
         }
     }
 
@@ -544,8 +562,10 @@ class EditViewModel @Inject constructor(
                 }
                 val note = notePad.note
                 notePadUiState = notePadUiState.copy(note = note.copy(detail = "${note.detail}\n$text"))
+                addNotify("Image text extracted")
             }catch (e:Exception){
                 e.printStackTrace()
+                addNotify("Error occur during extract of image")
             }
 
         }
@@ -812,9 +832,11 @@ class EditViewModel @Inject constructor(
         val setime = LocalDateTime(date, time).toInstant(TimeZone.currentSystemDefault())
         if (setime.toEpochMilliseconds() > now.toEpochMilliseconds()) {
             setAlarm(setime.toEpochMilliseconds(), interval)
-            Log.e("editv","Set Alarm")
+            //Timber.tag("editv").e("Set Alarm")
+            addNotify("Alarm is set")
         }else{
-            Log.e("editv","Alarm not set $now $setime")
+            //Timber.tag("editv").e("Alarm not set " + now + " " + setime)
+            addNotify("Alarm not set, time as past")
         }
 
     }
@@ -867,7 +889,7 @@ class EditViewModel @Inject constructor(
         }
         val datetime=LocalDateTime(date,time)
 
-        Log.e("onSettime","current $today date $datetime")
+        Timber.tag("onSettime").e("current " + today + " date " + datetime)
 
 
         _dateTimeState.update {
@@ -881,5 +903,25 @@ class EditViewModel @Inject constructor(
         }
     }
 
+    private fun addNotify(text: String) {
+        val notifies = _messages.value.toMutableList()
+
+        notifies.add(Notify(message = text, callback = ::onNotifyDelive))
+        _messages.update {
+            notifies.toImmutableList()
+        }
+    }
+
+    private fun onNotifyDelive() {
+
+        val notifies = _messages.value.toMutableList()
+
+        notifies.removeFirst()
+        _messages.update {
+            notifies.toImmutableList()
+        }
+    }
+
+
 
 }
diff --git a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainScreen.kt b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainScreen.kt
index 6b0535e2..9307df2e 100644
--- a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainScreen.kt
+++ b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainScreen.kt
@@ -56,10 +56,8 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextField
@@ -89,7 +87,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.app.ShareCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.loader.content.Loader
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.rememberLottieComposition
@@ -97,6 +94,7 @@ import com.mshdabiola.designsystem.component.ColorDialog
 import com.mshdabiola.designsystem.component.DateDialog
 import com.mshdabiola.designsystem.component.NoteCard
 import com.mshdabiola.designsystem.component.NotificationDialogNew
+import com.mshdabiola.designsystem.component.NotifySnacker
 import com.mshdabiola.designsystem.component.TimeDialog
 import com.mshdabiola.designsystem.component.state.LabelUiState
 import com.mshdabiola.designsystem.component.state.NotePadUiState
@@ -383,29 +381,11 @@ fun MainScreen(
         notePads.filter { it.note.selected }
             .all { it.note.isPin }
     }
-    val snackHostState = remember {
+    val snackbarHostState = remember {
         SnackbarHostState()
     }
-    LaunchedEffect(key1 = messages, block = {
-        if (messages.isNotEmpty()) {
-            val first = messages.first()
-            when (
-                snackHostState.showSnackbar(
-                    message = first.message,
-                    withDismissAction = first.withDismissAction,
-                    actionLabel = first.label,
-                    duration = if (first.isShort) SnackbarDuration.Short else SnackbarDuration.Long,
-                )
-            ) {
-                SnackbarResult.ActionPerformed -> {
-                }
 
-                SnackbarResult.Dismissed -> {
-                    first.callback()
-                }
-            }
-        }
-    })
+    NotifySnacker(snackHostState = snackbarHostState, notifys = messages)
 
     ModalNavigationDrawer(
         drawerContent = {
@@ -500,7 +480,7 @@ fun MainScreen(
                     }
                 }
             },
-            snackbarHost = { SnackbarHost(hostState = snackHostState) },
+            snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
             bottomBar = {
                 BottomAppBar(
                     actions = {
diff --git a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
index cf04cb23..3bffdaac 100644
--- a/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
+++ b/feature/mainscreen/src/main/java/com/mshdabiola/mainscreen/MainViewModel.kt
@@ -50,6 +50,7 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.plus
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
+import timber.log.Timber
 import javax.inject.Inject
 import kotlin.time.DurationUnit
 
@@ -341,19 +342,7 @@ class MainViewModel
         }
     }
 
-    private fun addMessage(msg: String) {
-        val msgs = mainState.value.messages.toMutableList()
 
-        msgs.add(Notify(message = msg, callback = ::onMessageDeliver))
-        _mainState.value = mainState.value.copy(messages = msgs.toImmutableList())
-    }
-
-    private fun onMessageDeliver() {
-        val msgs = mainState.value.messages.toMutableList()
-
-        msgs.removeFirst()
-        _mainState.value = mainState.value.copy(messages = msgs.toImmutableList())
-    }
 
     fun deleteEmptyNote() {
         viewModelScope.launch(Dispatchers.IO) {
@@ -366,7 +355,7 @@ class MainViewModel
             if (emptyList.isNotEmpty()) {
                 notepadRepository.deleteNotePad(emptyList.map { it.toNotePad() })
 
-                addMessage("Remove empty note")
+                addNotify("Remove empty note")
             }
         }
     }
@@ -701,5 +690,22 @@ class MainViewModel
         }
     }
 
+    private fun addNotify(text: String) {
+        val notifies = mainState.value.messages.toMutableList()
+
+        notifies.add(Notify(message = text, callback = ::onNotifyDelive))
+        _mainState.update {
+            it.copy(messages = notifies.toImmutableList())
+        }
+    }
+
+    private fun onNotifyDelive() {
+        Timber.d("Remove")
+        val notifies = mainState.value.messages.toMutableList()
+
+        notifies.removeFirst()
+        _mainState.value = mainState.value.copy(messages = notifies.toImmutableList())
+    }
+
 
 }

From 21cfc1e9cccc736ab8b591b47c2660039c710fe9 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 21:30:24 +0100
Subject: [PATCH 5/6] fix: drawing order

---
 .../src/main/java/com/mshdabiola/worker/util/IntermediaryData.kt | 1 +
 .../src/main/java/com/mshdabiola/drawing/DrawingController.kt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/worker/src/main/java/com/mshdabiola/worker/util/IntermediaryData.kt b/core/worker/src/main/java/com/mshdabiola/worker/util/IntermediaryData.kt
index 99b85508..1d16f1b5 100644
--- a/core/worker/src/main/java/com/mshdabiola/worker/util/IntermediaryData.kt
+++ b/core/worker/src/main/java/com/mshdabiola/worker/util/IntermediaryData.kt
@@ -62,6 +62,7 @@ fun changeToPathAndData(map : Map<PathData,List<Coordinate>>): List<Pair<Path, P
     var prevOff = Coordinate.Zero
 
     val p = map
+        .toSortedMap(comparator = compareBy { it.id })
         .map {
             val yPath = Path()
             it.value.forEachIndexed { index, offset ->
diff --git a/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingController.kt b/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingController.kt
index e276e5ef..1d8ba71a 100644
--- a/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingController.kt
+++ b/feature/drawing/src/main/java/com/mshdabiola/drawing/DrawingController.kt
@@ -194,6 +194,7 @@ class DrawingController {
 
         val p = _unCompletePathData
             .value
+            .toSortedMap(comparator = compareBy { it.id })
             .map {
                 val yPath = Path()
                 it.value.forEachIndexed { index, offset ->

From 76b634a6c4ac8a64b8145c519f7a27153b889fa7 Mon Sep 17 00:00:00 2001
From: mshabiola <mshdabiola@gmal.com>
Date: Sat, 15 Apr 2023 21:35:51 +0100
Subject: [PATCH 6/6] build: upgrade release/1.1.5

---
 .../src/main/kotlin/AndroidApplicationConventionPlugin.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index ab24b48b..9c5bd6af 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -34,8 +34,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 defaultConfig.targetSdk = 33
                // compileSdkPreview = "UpsideDownCake"
                 defaultConfig.minSdk = 24
-                defaultConfig.versionName = "1.1.4"
-                defaultConfig.versionCode = 12
+                defaultConfig.versionName = "1.1.5"
+                defaultConfig.versionCode = 13
 
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 defaultConfig.vectorDrawables {