Merge pull request #305 from PermanentOrg/master

Master
PermanentOrg · Oct 22, 2024 · 7f97b7b · 7f97b7b
2 parents f1407dd + 5bed5dd
commit 7f97b7b
Show file tree

Hide file tree

Showing 11 changed files with 201 additions and 133 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "org.permanent.PermanentArchive"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 68
-        versionName "1.9.2"
+        versionCode 72
+        versionName "1.9.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/org/permanent/permanent/models/Record.kt b/app/src/main/java/org/permanent/permanent/models/Record.kt
@@ -74,7 +74,7 @@ open class Record : Parcelable {
         folderLinkId = recordInfo.folder_linkId
         parentFolderLinkId = recordInfo.parentFolder_linkId
         displayName = recordInfo.displayName
-        displayDate = recordInfo.displayDT
+        displayDate = recordInfo.displayDT?.replace("T", " ")
         showArchiveThumb = false
         thumbURL200 = recordInfo.thumbURL200
         thumbURL2000 = recordInfo.thumbURL2000
@@ -100,7 +100,7 @@ open class Record : Parcelable {
         folderLinkId = recordInfo.folder_linkId
         parentFolderLinkId = recordInfo.parentFolder_linkId
         displayName = recordInfo.displayName
-        displayDate = recordInfo.displayDT
+        displayDate = recordInfo.displayDT?.replace("T", " ")
         showArchiveThumb = false
         thumbURL200 = recordInfo.thumbURL200
         thumbURL2000 = recordInfo.thumbURL2000
@@ -127,7 +127,7 @@ open class Record : Parcelable {
         folderLinkId = itemVO.folder_linkId
         parentFolderLinkId = itemVO.parentFolder_linkId
         displayName = itemVO.displayName
-        displayDate = itemVO.displayDT
+        displayDate = itemVO.displayDT?.replace("T", " ")
         archiveFullName = "The ${archiveVO.fullName} Archive"
         archiveThumbURL200 = archiveVO.thumbURL200
         showArchiveThumb = showArchiveThumbnail
@@ -172,7 +172,7 @@ open class Record : Parcelable {
         folderLinkId = recordInfo?.folder_linkId
         parentFolderLinkId = recordInfo?.parentFolder_linkId
         displayName = recordInfo?.displayName
-        displayDate = recordInfo?.displayDT
+        displayDate = recordInfo?.displayDT?.replace("T", " ")
         thumbURL200 = recordInfo?.thumbURL200
         thumbURL2000 = recordInfo?.thumbURL2000
         isThumbBlurred = shareByUrlVO.previewToggle == null || shareByUrlVO.previewToggle == 0

diff --git a/app/src/main/java/org/permanent/permanent/network/models/FileData.kt b/app/src/main/java/org/permanent/permanent/network/models/FileData.kt
@@ -52,7 +52,7 @@ class FileData private constructor() : Parcelable {
         }
         displayName = recordVO.displayName
         description = recordVO.description
-        displayDate = recordVO.displayDT
+        displayDate = recordVO.displayDT?.replace("T", " ")
         createdDate = recordVO.createdDT?.replace("T", " ")
         updatedDate = recordVO.updatedDT?.replace("T", " ")
         derivedDate = recordVO.derivedDT?.replace("T", " ")

diff --git a/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/EditFileNamesFragment.kt b/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/EditFileNamesFragment.kt
@@ -9,6 +9,8 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -21,6 +23,7 @@ import org.permanent.permanent.viewmodels.EditFileNamesViewModel
 class EditFileNamesFragment : PermanentBottomSheetFragment() {
 
     private lateinit var viewModel: EditFileNamesViewModel
+    private val onFileNameChanged = MutableLiveData<String>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -60,12 +63,28 @@ class EditFileNamesFragment : PermanentBottomSheetFragment() {
         return bottomSheetDialog
     }
 
-    override fun connectViewModelEvents() {
+    private val onFileNameChangedObserver = Observer<String> {
+        onFileNameChanged.value = it
+    }
 
+    override fun connectViewModelEvents() {
+        viewModel.getOnFileNameChanged().observe(this, onFileNameChangedObserver)
     }
 
     override fun disconnectViewModelEvents() {
+        viewModel.getOnFileNameChanged().removeObserver(onFileNameChangedObserver)
+    }
 
+    override fun onResume() {
+        super.onResume()
+        connectViewModelEvents()
     }
 
+    override fun onPause() {
+        super.onPause()
+        disconnectViewModelEvents()
+    }
+
+    fun getOnFilenameChanged() = onFileNameChanged
+
 }
diff --git a/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/EditMetadataFragment.kt b/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/EditMetadataFragment.kt
@@ -8,6 +8,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.platform.ComposeView
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.snackbar.Snackbar
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.models.Tag
 import org.permanent.permanent.ui.PermanentBaseFragment
@@ -21,6 +22,7 @@ class EditMetadataFragment : PermanentBaseFragment() {
     private var newTagFragment: NewTagFragment? = null
     private var locationFragment: EditLocationFragment? = null
     private var dateFragment: EditDateTimeFragment? = null
+    private var fileNameFragment: EditFileNamesFragment? = null
     private var records = ArrayList<Record>()
 
     override fun onCreateView(
@@ -49,9 +51,11 @@ class EditMetadataFragment : PermanentBaseFragment() {
                                 ?.observe(lifecycleOwner, onTagsAddedToSelectionObserver)
                         },
                         openEditFileNamesScreen = {
-                            var fragment = EditFileNamesFragment()
-                            fragment?.setBundleArguments(records)
-                            fragment?.show(parentFragmentManager, fragment?.tag)
+                            fileNameFragment = EditFileNamesFragment()
+                            fileNameFragment?.setBundleArguments(records)
+                            fileNameFragment?.show(parentFragmentManager, fileNameFragment?.tag)
+                            fileNameFragment?.getOnFilenameChanged()
+                                ?.observe(lifecycleOwner, onFilenameChangedObserver)
                         },
                         openDateAndTimeScreen = {
                             dateFragment = EditDateTimeFragment()
@@ -85,6 +89,10 @@ class EditMetadataFragment : PermanentBaseFragment() {
         viewModel.onDateChanged(it)
     }
 
+    private val onFilenameChangedObserver = Observer<String> {
+        viewModel.showInfoMessage.value = it
+    }
+
 
     override fun connectViewModelEvents() {
 
@@ -94,6 +102,7 @@ class EditMetadataFragment : PermanentBaseFragment() {
         newTagFragment?.getOnTagsAddedToSelection()?.removeObserver(onTagsAddedToSelectionObserver)
         locationFragment?.getOnLocationChanged()?.removeObserver(onLocationChangedObserver)
         dateFragment?.getOnDateChanged()?.removeObserver(onDateChangedObserver)
+        fileNameFragment?.getOnFilenameChanged()?.removeObserver(onFilenameChangedObserver)
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditDateTimeScreen.kt b/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditDateTimeScreen.kt
@@ -18,6 +18,7 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DatePicker
 import androidx.compose.material3.DatePickerDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SelectableDates
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TimePicker
@@ -47,6 +48,7 @@ import androidx.core.content.ContextCompat
 import org.permanent.permanent.R
 import org.permanent.permanent.viewmodels.EditDateTimeViewModel
 import java.text.SimpleDateFormat
+import java.time.LocalDate
 import java.util.Date
 import java.util.Locale
 
@@ -63,8 +65,10 @@ fun EditDateTimeScreen(
     val openAlertDialog = remember { mutableStateOf(false) }
 
     val datePickerState = rememberDatePickerState(
-        initialSelectedDateMillis = viewModel.initialDateMilis
+        initialSelectedDateMillis = viewModel.initialDateMilis,
+        selectableDates = PastOrPresentSelectableDates
     )
+
     val selectedDate = datePickerState.selectedDateMillis?.let {
         convertMillisToDate(it)
     } ?: ""
@@ -216,7 +220,7 @@ fun EditDateTimeScreen(
                     cancelButtonText = stringResource(id = R.string.button_cancel),
                     onConfirm = {
                         openAlertDialog.value = false
-                        viewModel.updateDate(dateString = "${selectedDate}T${selectedTime}")
+                        viewModel.updateDate(dateString = "$selectedDate $selectedTime")
                     }) {
                     openAlertDialog.value = false
                 }
@@ -264,4 +268,15 @@ fun convertTimeToString(hour: Int, min: Int, sec: Int): String {
     val secString = String.format("%02d", sec)
 
     return "$hourString:$minString:$secString"
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+private object PastOrPresentSelectableDates: SelectableDates {
+    override fun isSelectableDate(utcTimeMillis: Long): Boolean {
+        return utcTimeMillis <= System.currentTimeMillis()
+    }
+
+    override fun isSelectableYear(year: Int): Boolean {
+        return year <= LocalDate.now().year
+    }
 }