09/03/2024.

City-Zouitel · Mar 10, 2024 · efe0299 · efe0299
1 parent 90cda44
commit efe0299
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 31 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.scope.ProjectInfo.Companion.getBaseName
+
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.cityzouitel.androidApplication)
@@ -16,12 +18,10 @@ android {
 
     buildTypes {
         release {
+            isDebuggable = false
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 }

diff --git a/common/systemDesign/src/main/java/city/zouitel/systemDesign/Cons.kt b/common/systemDesign/src/main/java/city/zouitel/systemDesign/Cons.kt
@@ -6,7 +6,7 @@ object Cons {
     const val NUL = "null"
     const val NONE = "unspecified"
 
-    const val APP_VERSION = "5.2.0"
+    const val APP_VERSION = "5.2.1"
 
     const val ID = "Id"
     const val TITLE = "Title"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,8 +4,8 @@ kotlin = "1.9.22"
 compilesdk-v = "34"
 minsdk-v = "26"
 targetsdk-v = "34"
-code-v = "520"
-name-v = "5.2.0"
+code-v = "521"
+name-v = "5.2.1"
 compose-v = "1.5.8"
 
 #Android.

diff --git a/root/src/main/java/city/zouitel/root/RootViewModel.kt b/root/src/main/java/city/zouitel/root/RootViewModel.kt
@@ -3,7 +3,7 @@ package city.zouitel.root
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import city.zouitel.domain.usecase.RootUseCase
-import city.zouitel.root.base.Mapper
+import city.zouitel.root.mapper.RootMapper
 import city.zouitel.root.model.Root as InRoot
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow

diff --git a/root/src/main/java/city/zouitel/root/di/rootKoinModule.kt b/root/src/main/java/city/zouitel/root/di/rootKoinModule.kt
@@ -1,6 +1,6 @@
 package city.zouitel.root.di
 
-import city.zouitel.root.RootMapper
+import city.zouitel.root.mapper.RootMapper
 import city.zouitel.root.RootViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.module.dsl.factoryOf

diff --git a/...main/java/city/zouitel/root/RootMapper.kt → ...va/city/zouitel/root/mapper/RootMapper.kt b/...main/java/city/zouitel/root/RootMapper.kt → ...va/city/zouitel/root/mapper/RootMapper.kt
@@ -1,8 +1,8 @@
-package city.zouitel.root
+package city.zouitel.root.mapper
 
 import city.zouitel.domain.model.Root as OutRoot
 import city.zouitel.root.model.Root as InRoot
-import city.zouitel.root.base.Mapper
+import city.zouitel.root.mapper.base.Mapper
 import city.zouitel.root.model.Root
 
 class RootMapper: Mapper.ReadOnly<OutRoot, InRoot> {

diff --git a/...ain/java/city/zouitel/root/base/Mapper.kt → ...a/city/zouitel/root/mapper/base/Mapper.kt b/...ain/java/city/zouitel/root/base/Mapper.kt → ...a/city/zouitel/root/mapper/base/Mapper.kt
@@ -1,4 +1,4 @@
-package city.zouitel.root.base
+package city.zouitel.root.mapper.base
 
 sealed interface Mapper {
     interface Base<In, Out> {

diff --git a/ui/features/note/src/main/java/city/zouitel/note/ui/edit_screen/EditScreen.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/edit_screen/EditScreen.kt
@@ -21,21 +21,17 @@ 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.KeyboardOptions
 import androidx.compose.foundation.text2.input.rememberTextFieldState
 import androidx.compose.material3.AssistChip
 import androidx.compose.material3.AssistChipDefaults
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.ElevatedAssistChip
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -59,11 +55,7 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -86,13 +78,13 @@ import city.zouitel.note.model.Data
 import city.zouitel.note.ui.bottom_bar.AddEditBottomBar
 import city.zouitel.recoder.ui.RecordingNote
 import city.zouitel.reminder.ui.RemindingNote
+import city.zouitel.systemDesign.CommonTextField
 import city.zouitel.systemDesign.Cons.REC_DIR
 import city.zouitel.systemDesign.Cons.IMG_DIR
 import city.zouitel.systemDesign.Cons.JPEG
 import city.zouitel.systemDesign.Cons.KEY_STANDARD
 import city.zouitel.systemDesign.Cons.MP3
 import city.zouitel.systemDesign.Cons.NON
-import city.zouitel.systemDesign.Cons.NUL
 import city.zouitel.systemDesign.DataStoreVM
 import city.zouitel.systemDesign.Icons
 import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18
@@ -101,7 +93,6 @@ import city.zouitel.systemDesign.ImageDisplayed
 import city.zouitel.systemDesign.MaterialColors
 import city.zouitel.systemDesign.MaterialColors.Companion.OUT_LINE_VARIANT
 import city.zouitel.systemDesign.SoundEffect
-import city.zouitel.systemDesign.decodeUrl
 import city.zouitel.systemDesign.findUrlLink
 import city.zouitel.tags.model.NoteAndTag
 import city.zouitel.tags.viewmodel.NoteAndTagScreenModel
@@ -139,14 +130,19 @@ data class EditScreen(
         val linkVM: LinkVM by inject()
         val noteAndLinkVM: NoteAndLinkVM by inject()
 
-        val titleState = (if (title == NUL || title.isNullOrEmpty()) null else decodeUrl.invoke(title))?.let { rememberTextFieldState(initialText = it) }
-        val descriptionState = (if (description == NUL) null else decodeUrl.invoke(description))?.let { rememberTextFieldState(initialText = it) }
+//        val titleState = (if (title == NUL || title.isNullOrEmpty()) null else decodeUrl.invoke(title))?.let { rememberTextFieldState(initialText = it) }
+        val titleState = rememberTextFieldState()
 
-        val ctx = LocalContext.current
+//        val descriptionState = (if (description == NUL) null else decodeUrl.invoke(description))?.let { rememberTextFieldState(initialText = it) }
+        val descriptionState = rememberTextFieldState()
+
+        var focusState by remember { mutableStateOf(false) }
+
+        val context = LocalContext.current
         val navigator = LocalNavigator.current
         val keyboardManager = LocalFocusManager.current
         val keyboardController = LocalSoftwareKeyboardController.current
-        val internalPath = ctx.filesDir.path
+        val internalPath = context.filesDir.path
 
         val focusRequester by lazy { FocusRequester() }
         val getMatColor by lazy { MaterialColors().getMaterialColor }
@@ -230,7 +226,7 @@ data class EditScreen(
         val chooseImageLauncher =
             rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) {
                 imageUriState = it
-                dataModel::decodeBitmapImage.invoke(img, photoState, it!!, ctx)
+                dataModel::decodeBitmapImage.invoke(img, photoState, it!!, context)
                 img.value = photoState.value
                 dataModel::saveImageLocally.invoke(
                     img.value, "$internalPath/$IMG_DIR", "$id.$JPEG"
@@ -247,11 +243,11 @@ data class EditScreen(
                     containerColor = getMatColor(OUT_LINE_VARIANT),
                     contentColor = contentColorFor(backgroundColor = getMatColor(OUT_LINE_VARIANT)),
                     onClick = {
-                        sound.makeSound.invoke(ctx, KEY_STANDARD, thereIsSoundEffect)
+                        sound.makeSound.invoke(context, KEY_STANDARD, thereIsSoundEffect)
                         dataModel.editData(
                             Data(
-                                title = if (titleState?.text.isNullOrBlank()) null else titleState?.text.toString(),
-                                description = if (descriptionState?.text.isNullOrBlank()) null else descriptionState?.text.toString(),
+                                title = if (titleState.text.isBlank()) null else titleState.text.toString(),
+                                description = if (descriptionState.text.isBlank()) null else descriptionState.text.toString(),
                                 priority = priorityState.value,
                                 uid = id,
                                 audioDuration = audioDuration,
@@ -320,6 +316,24 @@ data class EditScreen(
 
                 // The Title.
                 item {
+                    CommonTextField(
+                        state = titleState,
+                        modifier = Modifier
+                            .padding(10.dp)
+                            .height(30.dp)
+                            .focusRequester(focusRequester)
+                            .onFocusEvent {
+                                isTitleFieldFocused.value = it.isFocused
+                            },
+
+                        placeholder = "Title",
+                        textSize = 24,
+                        textColor = textColorState.intValue,
+                        imeAction = ImeAction.Next,
+                        keyboardActions = KeyboardActions(
+                            onNext = { keyboardManager.moveFocus(FocusDirection.Next) }
+                        )
+                    )
 //                    OutlinedTextField(
 //                        value = titleState.value ?: "",
 //                        onValueChange = { titleState.value = it },
@@ -364,6 +378,26 @@ data class EditScreen(
 
                 // The Description.
                 item {
+                    CommonTextField(
+                        state = descriptionState,
+                        modifier = Modifier
+                            .padding(10.dp)
+                            .height(60.dp)
+                            .onFocusEvent {
+                                isDescriptionFieldFocused.value = it.isFocused
+                                focusState = it.isFocused
+                            },
+                        placeholder = "Note",
+                        textSize = 19,
+                        textColor = textColorState.intValue,
+                        imeAction = ImeAction.Default,
+                        keyboardActions = KeyboardActions(
+                            /*onDone = {
+                                keyboardController?.hide()
+                                keyboardManager.clearFocus()
+                            }*/
+                        )
+                    )
 //                    OutlinedTextField(
 //                        value = descriptionState.value ?: "",
 //                        onValueChange = {
@@ -407,7 +441,7 @@ data class EditScreen(
                     ) {
                         NormalMediaPlayer(localMediaUid = id)
                         audioDurationState.intValue =
-                            exoViewModule.getMediaDuration(ctx, mediaFile).toInt()
+                            exoViewModule.getMediaDuration(context, mediaFile).toInt()
 
                     }
                 }