05/07/2024.

app/src/main/AndroidManifest.xml

@@ -9,11 +9,12 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
@@ -24,6 +25,8 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"
+        tools:ignore="SelectedPhotoAccess" />
 
     <application
         android:name=".NoteApplication"

app/src/main/java/city/zouitel/jetnote/NoteActivity.kt

@@ -1,6 +1,9 @@
 package city.zouitel.jetnote
 
+import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -40,14 +43,16 @@ class NoteActivity : ComponentActivity(), KoinComponent, IntentHandler {
             require(!isDeviceRooted.value.getOrNull()?.isDeviceRooted!!) {
                 "Cannot run JetNote on rooted device!".asLongToast()
             }
-            MainTheme(dataStoreModel) @Suppress("all") {
+
+            MainTheme(dataStoreModel) {
                 BottomSheetNavigator(
                     sheetShape = ShapeDefaults.Large,
                     sheetElevation = 150.dp
                 ) {
                     Navigator(MainScreen(true))
                 }
             }
+
             IntentHandler(intent, navigator) {}
         }
     }
@@ -59,7 +64,7 @@ class NoteActivity : ComponentActivity(), KoinComponent, IntentHandler {
 
     override fun onDestroy() {
         super.onDestroy()
-        linkScreenModel.urlPreview(this, null/*, null, null, null*/)?.cleanUp()
+        linkScreenModel.urlPreview(this, null)?.cleanUp()
         WidgetReceiver.updateBroadcast(this)
     }
 

app/src/main/java/city/zouitel/jetnote/NoteApplication.kt

@@ -6,6 +6,7 @@ import city.zouitel.database.di.databaseKoinModule
 import city.zouitel.datastore.datastoreKoinModule
 import city.zouitel.init.initializerKoinModule
 import city.zouitel.links.di.linksKoinModule
+import city.zouitel.media.di.mediaKoinModule
 import city.zouitel.screens.di.navigationKoinModule
 import city.zouitel.note.di.noteKoinModule
 import city.zouitel.notifications.di.notificationKoinModule
@@ -56,6 +57,7 @@ class NoteApplication: Application(), KoinComponent, ImageLoaderFactory {
                 navigationKoinModule,
                 initializerKoinModule,
                 rootKoinModule,
+                mediaKoinModule
             )
         }
 

common/systemDesign/build.gradle.kts

@@ -18,8 +18,6 @@ dependencies {
 
     //Accompanist.
     implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.pager)
-    implementation(libs.accompanist.pager.indicators)
     implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.navigation.animation)
     implementation(libs.accompanist.swiperefresh)

common/systemDesign/src/main/java/city/zouitel/systemDesign/CommonConstants.kt

@@ -1,7 +1,7 @@
 package city.zouitel.systemDesign
 
 object CommonConstants {
-    const val APP_VERSION = "5.7.3"
+    const val APP_VERSION = "5.8.0"
     const val APP_NAME = "JetNote"
     const val NONE = "unspecified"
 

core/database/schemas/city.zouitel.database.Database/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "cddfa9dc370b73ab53f9c894202b6dc5",
+    "identityHash": "c7cb924f82eda6b261d8857824000dbc",
     "entities": [
       {
         "tableName": "notes_table",
@@ -344,12 +344,71 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "tableName": "media_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is video` INTEGER NOT NULL, `media_path` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isVideo",
+            "columnName": "is video",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "media_path",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "note_and_media",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`noteUid` TEXT NOT NULL, `mediaId` INTEGER NOT NULL, PRIMARY KEY(`noteUid`, `mediaId`))",
+        "fields": [
+          {
+            "fieldPath": "noteUid",
+            "columnName": "noteUid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mediaId",
+            "columnName": "mediaId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "noteUid",
+            "mediaId"
+          ]
+        },
+        "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, 'cddfa9dc370b73ab53f9c894202b6dc5')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c7cb924f82eda6b261d8857824000dbc')"
     ]
   }
 }

core/database/src/main/java/city/zouitel/database/Database.kt

@@ -7,9 +7,7 @@ import city.zouitel.database.model.*
 
 @Database(
     version = 1,
-    autoMigrations = [
-//        AutoMigration(from = 1, to = 2)
-    ],
+    autoMigrations = [],
     entities = [
         DataEntity::class,
         TagEntity::class,
@@ -19,7 +17,9 @@ import city.zouitel.database.model.*
         LinkEntity::class,
         NoteAndLinkEntity::class,
         AudioEntity::class,
-        NoteAndAudioEntity::class
+        NoteAndAudioEntity::class,
+        MediaEntity::class,
+        NoteAndMediaEntity::class
     ],
     exportSchema = true
 )
@@ -35,4 +35,6 @@ abstract class Database:RoomDatabase() {
     abstract fun getNoteAndLinkDao(): NoteAndLinkDao
     abstract fun getAudioDao(): AudioDao
     abstract fun getNoteAndAudioDao(): NoteAndAudioDao
+    abstract fun getMediaDao(): MediaDao
+    abstract fun getNoteAndMediaDao(): NoteAndMediaDao
 }

core/database/src/main/java/city/zouitel/database/dao/MediaDao.kt

@@ -0,0 +1,26 @@
+package city.zouitel.database.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import city.zouitel.database.model.MediaEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface MediaDao {
+
+    @Query("SELECT * FROM MEDIA_TABLE")
+    fun getAllMedias(): Flow<List<MediaEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addMedia(media: MediaEntity)
+
+    @Update(onConflict = OnConflictStrategy.REPLACE)
+    fun updateMedia(media: MediaEntity)
+
+    @Delete
+    fun deleteMedia(media: MediaEntity)
+}

core/database/src/main/java/city/zouitel/database/dao/NoteAndMediaDao.kt

@@ -0,0 +1,27 @@
+package city.zouitel.database.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import city.zouitel.database.model.MediaEntity
+import city.zouitel.database.model.NoteAndMediaEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface NoteAndMediaDao {
+
+    @Query("SELECT * FROM NOTE_AND_MEDIA")
+    fun getAllMedias(): Flow<List<NoteAndMediaEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addNoteAndMedia(noteAndMedia: NoteAndMediaEntity)
+
+    @Update(onConflict = OnConflictStrategy.REPLACE)
+    fun updateNoteAndMedia(noteAndMedia: NoteAndMediaEntity)
+
+    @Delete
+    fun deleteNoteAndMedia(noteAndMedia: NoteAndMediaEntity)
+}

core/database/src/main/java/city/zouitel/database/datasourceImpl/MediaDataSourceImpl.kt

@@ -0,0 +1,28 @@
+package city.zouitel.database.datasourceImpl
+
+import city.zouitel.database.dao.MediaDao
+import city.zouitel.database.mapper.MediaMapper
+import city.zouitel.repository.datasource.MediaDataSource
+import city.zouitel.repository.model.Media
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class MediaDataSourceImpl(
+    private val dao: MediaDao,
+    private val mapper: MediaMapper
+): MediaDataSource {
+    override val getAllMedias: Flow<List<Media>>
+        get() = dao.getAllMedias().map { medias -> mapper.toRepo(medias) }
+
+    override fun addMedia(media: Media) {
+        dao.addMedia(mapper.fromRepo(media))
+    }
+
+    override fun updateMedia(media: Media) {
+        dao.updateMedia(mapper.fromRepo(media))
+    }
+
+    override fun deleteMedia(media: Media) {
+        dao.deleteMedia(mapper.fromRepo(media))
+    }
+}

core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndMediaDataSourceImpl.kt

@@ -0,0 +1,28 @@
+package city.zouitel.database.datasourceImpl
+
+import city.zouitel.database.dao.NoteAndMediaDao
+import city.zouitel.database.mapper.NoteAndMediaMapper
+import city.zouitel.repository.datasource.NoteAndMediaDataSource
+import city.zouitel.repository.model.NoteAndMedia
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class NoteAndMediaDataSourceImpl(
+    private val dao: NoteAndMediaDao,
+    private val mapper: NoteAndMediaMapper
+): NoteAndMediaDataSource {
+    override val getAllNotesAndMedia: Flow<List<NoteAndMedia>>
+        get() = dao.getAllMedias().map { notesAndMedia -> mapper.toRepo(notesAndMedia) }
+
+    override fun addNoteAndMedia(noteAndMedia: NoteAndMedia) {
+        dao.addNoteAndMedia(mapper.fromRepo(noteAndMedia))
+    }
+
+    override fun updateNoteAndMedia(noteAndMedia: NoteAndMedia) {
+        dao.updateNoteAndMedia(mapper.fromRepo(noteAndMedia))
+    }
+
+    override fun deleteNoteAndMedia(noteAndMedia: NoteAndMedia) {
+        dao.deleteNoteAndMedia(mapper.fromRepo(noteAndMedia))
+    }
+}