From eb76c0b0a46d9fa85312d73d6fbee2c2dec90c06 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 8 Aug 2023 15:08:12 +0800
Subject: [PATCH] Use NCInputDateField in ShareDetailsPage

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/filedetails/ShareDetailsPage.qml | 29 +++++++++++++-----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml
index 380fd1142..c09f42abd 100644
--- a/src/gui/filedetails/ShareDetailsPage.qml
+++ b/src/gui/filedetails/ShareDetailsPage.qml
@@ -64,7 +64,7 @@ Page {
     readonly property string passwordPlaceholder: "●●●●●●●●●●"
 
     readonly property var expireDate: shareModelData.expireDate // Don't use int as we are limited
-    readonly property var maximumExpireDate: shareModelData.enforcedMaximumExpireDate
+    readonly property var maximumExpireDate: shareModelData.enforcedMaximumExpireDate // msecs epoch
 
     readonly property string linkShareLabel: shareModelData.linkShareLabel ?? ""
 
@@ -127,7 +127,7 @@ Page {
         //
         // So to ensure that the text of the spin box is correctly updated, force an update of the
         // contents of the expire date text field.
-        expireDateSpinBox.updateText();
+        expireDateField.updateText();
         waitingForExpireDateChange = false;
     }
 
@@ -734,26 +734,29 @@ Page {
                 NCInputDateField {
                     id: expireDateField
 
-                    date: root.expireDate
-                    onDateChanged: {
-                        const value = valueFromText(text, expireDateSpinBox.locale);
-                        root.setExpireDate(value * dayInMSecs);
-                        root.waitingForExpireDateChange = true;
-                    }
+                    Layout.fillWidth: true
+                    height: visible ? implicitHeight : 0
 
-                    maximumDate: root.maximumExpireDate
-                    minimumDate: {
+                    dateInMs: root.expireDate
+                    maximumDateMs: root.maximumExpireDate
+                    minimumDateMs: {
                         const currentDate = new Date();
+                        const currentYear = currentDate.getFullYear();
+                        const currentMonth = currentDate.getMonth();
+                        const currentMonthDay = currentDate.getDate();
                         // Start of day at 00:00:0000 UTC
-                        return new Date(Date.UTC(currentDate.getFullYear(),
-                                                 currentDate.getMonth(),
-                                                 currentDate.getDate() + 1));
+                        return Date.UTC(currentYear, currentMonth, currentMonthDay + 1);
                     }
 
                     enabled: root.expireDateEnabled &&
                              !root.waitingForExpireDateChange &&
                              !root.waitingForExpireDateEnabledChange
 
+                    onUserAcceptedDate: {
+                        root.setExpireDate(dateInMs);
+                        root.waitingForExpireDateChange = true;
+                    }
+
                     NCBusyIndicator {
                         anchors.fill: parent
                         visible: root.waitingForExpireDateEnabledChange ||
-- 
2.30.2