Merge pull request #1542 from nextcloud/adjust-message-editing

Adjust message editing
nextcloud · Feb 16, 2024 · 32512a8 · 32512a8
2 parents 722400b + 2a09c80
commit 32512a8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/NextcloudTalk/ChatViewController.swift b/NextcloudTalk/ChatViewController.swift
@@ -1527,7 +1527,7 @@ import UIKit
             let timestampDate = Date(timeIntervalSince1970: TimeInterval(message.lastEditTimestamp))
 
             let editInfo = UIAction(title: NSLocalizedString("Edited by", comment: "A message was edited by ...") + " " + lastEditActorDisplayName, attributes: [.disabled], handler: {_ in })
-            editInfo.subtitle = NCUtils.readableTimeOrDate(fromDate: timestampDate)
+            editInfo.subtitle = NCUtils.readableTimeAndDate(fromDate: timestampDate)
 
             actions.append(UIMenu(options: [.displayInline], children: [editInfo]))
         }

diff --git a/NextcloudTalk/InputbarViewController.swift b/NextcloudTalk/InputbarViewController.swift
@@ -116,6 +116,12 @@ import UIKit
         self.textInputbar.editorLeftButton.tintColor = .systemBlue
         self.textInputbar.editorRightButton.tintColor = .systemBlue
 
+        self.textInputbar.editorLeftButton.setImage(.init(systemName: "xmark"), for: .normal)
+        self.textInputbar.editorRightButton.setImage(.init(systemName: "checkmark"), for: .normal)
+
+        self.textInputbar.editorLeftButton.setTitle("", for: .normal)
+        self.textInputbar.editorRightButton.setTitle("", for: .normal)
+
         self.navigationController?.navigationBar.tintColor = NCAppBranding.themeTextColor()
         self.navigationController?.navigationBar.barTintColor = NCAppBranding.themeColor()
         self.navigationController?.navigationBar.isTranslucent = false

diff --git a/NextcloudTalk/NCUtils.swift b/NextcloudTalk/NCUtils.swift
@@ -178,6 +178,18 @@ import UniformTypeIdentifiers
         return dateFormatter.string(from: date)
     }
 
+    public static func readableTimeAndDate(fromDate date: Date) -> String {
+        if Calendar.current.isDateInToday(date) {
+            return self.getTime(fromDate: date)
+        }
+
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateStyle = .medium
+        dateFormatter.timeStyle = .short
+
+        return dateFormatter.string(from: date)
+    }
+
     public static func getTime(fromDate date: Date) -> String {
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .none