From 3d4e49642c1ca7b3da80dc8b32cb37c8b4eaea2e Mon Sep 17 00:00:00 2001
From: Evgenii Kozlov <ubuphobos@gmail.com>
Date: Thu, 13 Oct 2022 22:26:40 +0300
Subject: [PATCH] DROID-513 Sets | Fix | Date is displayed incorrectly in
 gallery view (#2657)

---
 .../widgets/dv/ListViewItemRelationGroupWidget.kt   |  2 +-
 .../presentation/objects/ObjectWrapperExtensions.kt |  2 +-
 .../presentation/relations/RelationExtensions.kt    | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt
index 5e08a4a9b1..a55406d4af 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt
@@ -62,7 +62,7 @@ class ListViewItemRelationGroupWidget @JvmOverloads constructor(
                 }
                 is DefaultObjectRelationValueView.Date -> {
                     val value = relation.timeInMillis?.formatTimestamp(
-                        isMillis = false,
+                        isMillis = true,
                         format = relation.dateFormat
                     )
                     if (value != null) {
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt
index bd76a37778..77c070463b 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt
@@ -101,7 +101,7 @@ fun ObjectWrapper.Basic.values(
                 val value = DefaultObjectRelationValueView.Date(
                     objectId = id,
                     relationKey = relation.key,
-                    timeInMillis = DateParser.parse(time),
+                    timeInMillis = DateParser.parseInMillis(time),
                     dateFormat = format
                 )
                 values.add(value)
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationExtensions.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationExtensions.kt
index 817b74b1b9..3ef44aa50e 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationExtensions.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationExtensions.kt
@@ -197,6 +197,19 @@ object DateParser {
         }
         return result
     }
+
+    fun parseInMillis(value: Any?) : Long? {
+        val result: Long? = when (value) {
+            is String -> value.toLongOrNull()
+            is Double -> value.toLong()
+            is Long -> value
+            else -> null
+        }
+        return if (result!= null)
+            result * 1000
+        else
+            null
+    }
 }
 
 /**