Merge pull request #304 from PermanentOrg/bugfix/edit-metadata-confir…

…mation-titles Fix description and change texts
PermanentOrg · Oct 3, 2024 · 82c7673 · 82c7673
2 parents 86ef4da + aee12ee
commit 82c7673
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditMetadataScreen.kt b/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditMetadataScreen.kt
@@ -122,7 +122,10 @@ fun EditMetadataScreen(
             lightGreyColor,
             someFilesHaveDescription,
             redColor,
-            smallTextSize
+            smallTextSize,
+            onTextChange = {
+                inputDescription = it
+            }
         )
 
         Divider(modifier = Modifier.padding(vertical = 16.dp))
@@ -282,9 +285,9 @@ private fun DescriptionView(
     lightGreyColor: Color,
     someFilesHaveDescription: Boolean?,
     redColor: Color,
-    smallTextSize: TextUnit
+    smallTextSize: TextUnit,
+    onTextChange: (String) -> Unit
 ) {
-    var description = inputDescription
     Row(
         verticalAlignment = Alignment.Top, horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
@@ -304,10 +307,8 @@ private fun DescriptionView(
     Spacer(modifier = Modifier.height(10.dp))
 
     TextField(
-        value = description,
-        onValueChange = { value ->
-            description = value
-        },
+        value = inputDescription,
+        onValueChange = onTextChange,
         label = { Text(text = stringResource(id = R.string.edit_files_metadata_description_hint)) },
         singleLine = true,
         modifier = Modifier

diff --git a/app/src/main/java/org/permanent/permanent/viewmodels/EditMetadataViewModel.kt b/app/src/main/java/org/permanent/permanent/viewmodels/EditMetadataViewModel.kt
@@ -26,7 +26,6 @@ class EditMetadataViewModel(application: Application) : ObservableAndroidViewMod
     private val tagsOfSelectedRecords =
         MutableLiveData<SnapshotStateList<Tag>>(mutableStateListOf())
     private var commonTags: MutableList<Tag> = mutableListOf()
-    private var initialDescription: String = ""
     private var commonDescription: String = ""
     private var showWarningSomeFilesHaveDescription = MutableLiveData(false)
     val showError = MutableLiveData<String>()
@@ -96,6 +95,7 @@ class EditMetadataViewModel(application: Application) : ObservableAndroidViewMod
     }
 
     private fun checkForCommonDescription() {
+        var initialDescription = ""
         for (record in records) {
             val recordDescription = record.fileData?.description
             if (!recordDescription.isNullOrBlank()) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -723,12 +723,12 @@
     <string name="add_location">Add Location</string>
     <string name="various_locations">Various locations</string>
     <string name="location_confirmation_title">New location</string>
-    <string name="location_confirmation_substring">Are you sure you want set a new location for selected items?</string>
+    <string name="location_confirmation_substring">Are you sure you want to set a new date &amp; time for the selected items?</string>
     <string name="add_date_time">Add date and time</string>
     <string name="add_date">Add date</string>
     <string name="various_date_times">Various dates and times</string>
     <string name="date_confirmation_title">New Date &amp; Time</string>
-    <string name="date_confirmation_substring">Are you sure you want set a new date &amp; time for selected items?</string>
+    <string name="date_confirmation_substring">Are you sure you want to set a new date &amp; time for the selected items?</string>
     <string name="set_date_and_time">Set date and time</string>