03/08/2024.

City-Zouitel · Aug 3, 2024 · 80f0f6e · 80f0f6e
1 parent cd1358f
commit 80f0f6e
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 175 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -65,6 +65,7 @@ dependencies {
     //Koin.
     implementation(libs.koin.worker)
 
-    //Coil.
+    //Coil
     implementation(libs.coil.compose)
+    implementation(libs.coil.gif)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.JetNote"
-        android:usesCleartextTraffic="false">
+        android:usesCleartextTraffic="false"
+        tools:ignore="DataExtractionRules">
 
         <profileable
             android:shell="true"

diff --git a/app/src/main/java/city/zouitel/jetnote/NoteApplication.kt b/app/src/main/java/city/zouitel/jetnote/NoteApplication.kt
@@ -1,6 +1,7 @@
 package city.zouitel.jetnote
 
 import android.app.Application
+import android.os.Build
 import city.zouitel.audios.di.audioPlayerKoinModule
 import city.zouitel.database.di.databaseKoinModule
 import city.zouitel.datastore.datastoreKoinModule
@@ -21,6 +22,8 @@ import city.zouitel.tasks.di.tasksKoinModule
 import city.zouitel.widget.di.widgetKoinModule
 import coil.ImageLoader
 import coil.ImageLoaderFactory
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
 import coil.memory.MemoryCache
 import coil.request.CachePolicy
 import com.karacca.beetle.Beetle
@@ -86,6 +89,13 @@ class NoteApplication: Application(), KoinComponent, ImageLoaderFactory {
                     .weakReferencesEnabled(true)
                     .build()
             }
+            .components {
+                if (Build.VERSION.SDK_INT >= 28) {
+                    add(ImageDecoderDecoder.Factory())
+                } else {
+                    add(GifDecoder.Factory())
+                }
+            }
             .build()
     }
 }
diff --git a/common/systemDesign/build.gradle.kts b/common/systemDesign/build.gradle.kts
@@ -19,13 +19,11 @@ dependencies {
     //Accompanist.
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.systemuicontroller)
-//    implementation(libs.accompanist.navigation.animation)
     implementation(libs.accompanist.swiperefresh)
-//    implementation(libs.accompanist.flowlayout)
 
     //Baha-UrlPreview.
     implementation(libs.url.preview)
 
     //Balloon.
-    implementation ("com.github.skydoves:balloon-compose:1.6.4")
+    implementation (libs.balloon.compose)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -65,6 +65,7 @@ camerax = "1.3.1"
 #Coil
 coil-compose = "2.7.0"
 coil-svg = "2.6.0"
+coil-gif = "2.5.0"
 
 #License.
 license = "11.1.4"
@@ -85,6 +86,7 @@ amplituda = "2.2.2"
 #android-startup = "1.1.0"
 enigma = "1.0.0.8"
 media3 = "1.3.1"
+balloon-compose = "1.6.4"
 
 [libraries]
 #Kotlin.
@@ -167,6 +169,7 @@ camerax-extensions = { module = "androidx.camera:camera-extensions", version.ref
 #Coil.
 coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" }
 coil_svg = { module = "io.coil-kt:coil-svg", version.ref = "coil-svg" }
+coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil-gif" }
 
 #License.
 licenses = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "license" }
@@ -195,6 +198,7 @@ audiowaveform = { module = "com.github.lincollincol:compose-audiowaveform", vers
 amplituda = { module = "com.github.lincollincol:amplituda", version.ref = "amplituda" }
 #android-startup = { module = "io.github.idisfkj:android-startup", version.ref = "android-startup" }
 enigma = { module = "gradle.plugin.chrisney:enigma", version.ref = "enigma" }
+balloon-compose = { module = "com.github.skydoves:balloon-compose", version.ref = "balloon-compose" }
 
 [bundles]
 compose = ["ui", "ui-tooling-preview", "material3"]

diff --git a/ui/features/media/src/main/java/city/zouitel/media/ui/MediaScreen.kt b/ui/features/media/src/main/java/city/zouitel/media/ui/MediaScreen.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
@@ -74,7 +75,7 @@ data class MediaScreen(val id: String, val backgroundColor: Int = 0): Screen {
                 ) { index ->
                     BadgedBox(
                         modifier = Modifier
-                            .fillMaxWidth()
+                            .fillMaxSize()
                             .background(Color(backgroundColor)),
                         badge = {
                             if (filteredMedias.count() > 1) {

diff --git a/ui/features/note/src/main/java/city/zouitel/note/ui/workplace/WorkplaceScreen.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/workplace/WorkplaceScreen.kt
@@ -3,11 +3,11 @@ package city.zouitel.note.ui.workplace
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.icu.util.Calendar
+import android.net.Uri
 import android.text.format.DateFormat
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.ContextualFlowRow
@@ -21,10 +21,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.input.KeyboardActionHandler
 import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.material3.AssistChip
 import androidx.compose.material3.AssistChipDefaults
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
@@ -85,7 +82,7 @@ import city.zouitel.note.ui.bottom_bar.AddEditBottomBar
 import city.zouitel.notifications.viewmodel.NotificationScreenModel
 import city.zouitel.recoder.ui.RecorderScreen
 import city.zouitel.reminder.ui.RemindingNote
-import city.zouitel.systemDesign.CommonTextField
+import city.zouitel.note.utils.TextField
 import city.zouitel.systemDesign.CommonConstants
 import city.zouitel.systemDesign.DataStoreScreenModel
 import city.zouitel.systemDesign.CommonIcons
@@ -212,10 +209,7 @@ data class WorkplaceScreen(
             rememberLauncherForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { uris ->
                 uris.forEach { uri ->
                     context.contentResolver.takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                    Random.nextLong().let {
-                        mediaModel.addMedia(Media(id = it, path = uri.toString()))
-                        noteAndMediaModel.addNoteAndMedia(NoteAndMedia(id, it))
-                    }
+                    mediaInsert(mediaModel, noteAndMediaModel)
                 }
             }
 
@@ -323,8 +317,9 @@ data class WorkplaceScreen(
 
                 // The Title.
                 item {
-                    CommonTextField(
+                    TextField(
                         state = titleState,
+                        receiver = mediaInsert(mediaModel, noteAndMediaModel),
                         modifier = Modifier
                             .height(50.dp)
                             .focusRequester(focusRequester)
@@ -336,7 +331,6 @@ data class WorkplaceScreen(
                         textSize = 24.sp,
                         textColor = Color(uiState.textColor),
                         imeAction = ImeAction.Next,
-//                        keyboardAction = KeyboardActions(onNext = { keyboardManager.moveFocus(FocusDirection.Next) })
                         keyboardAction = {
                             keyboardManager.moveFocus(FocusDirection.Next)
                         }
@@ -345,8 +339,9 @@ data class WorkplaceScreen(
 
                 // The Description.
                 item {
-                    CommonTextField(
+                    TextField(
                         state = descriptionState,
+                        receiver = mediaInsert(mediaModel, noteAndMediaModel),
                         modifier = Modifier
                             .height(200.dp)
                             .onFocusEvent {
@@ -520,4 +515,14 @@ data class WorkplaceScreen(
             }
         }
     }
+
+    private fun mediaInsert(
+        mediaModel: MediaScreenModel,
+        noteAndMediaModel: NoteAndMediaScreenModel
+    ): (Uri) -> Unit = { uri ->
+        Random.nextLong().let {
+            mediaModel.addMedia(Media(id = it, path = uri.toString()))
+            noteAndMediaModel.addNoteAndMedia(NoteAndMedia(id, it))
+        }
+    }
 }
diff --git a/...y/zouitel/systemDesign/CommonTextField.kt → ...java/city/zouitel/note/utils/TextField.kt b/...y/zouitel/systemDesign/CommonTextField.kt → ...java/city/zouitel/note/utils/TextField.kt
@@ -1,12 +1,15 @@
-package city.zouitel.systemDesign
+package city.zouitel.note.utils
 
+import android.net.Uri
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.content.MediaType
+import androidx.compose.foundation.content.contentReceiver
+import androidx.compose.foundation.content.hasMediaType
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.text.input.KeyboardActionHandler
 import androidx.compose.foundation.text.input.TextFieldState
@@ -26,8 +29,9 @@ import androidx.compose.ui.unit.dp
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun CommonTextField(
+internal fun TextField(
     state: TextFieldState,
+    receiver: (Uri) -> Unit,
     modifier: Modifier,
     placeholder: String = "...",
     textSize: TextUnit = TextUnit(19f, TextUnitType.Sp),
@@ -50,7 +54,17 @@ fun CommonTextField(
             modifier = modifier
                 .fillMaxWidth()
                 .padding(10.dp)
-                .background(Color.Transparent),
+                .background(Color.Transparent)
+                .contentReceiver { content ->
+                    if(content.hasMediaType(MediaType.Image)) {
+                        val data = content.clipEntry.clipData
+                        for (index in 0 until data.itemCount) {
+                            val item = data.getItemAt(index)
+                            receiver.invoke(item.uri)
+                        }
+                    }
+                    content
+                },
             textStyle = TextStyle(
                 fontSize = textSize,
                 fontWeight = FontWeight.Normal,
@@ -59,7 +73,7 @@ fun CommonTextField(
             ),
             keyboardOptions = KeyboardOptions(
                 capitalization = KeyboardCapitalization.Sentences,
-                autoCorrect = false,
+                autoCorrectEnabled = false,
                 keyboardType = KeyboardType.Text,
                 imeAction = imeAction
             ),