NMC 1997 - Sharing customisation changes and new-sharing-design customisation changes

Author: harshada-15-tsys

Nextcloud.xcodeproj/project.pbxproj

@@ -1,6 +1,26 @@
-// SPDX-FileCopyrightText: Nextcloud GmbH
-// SPDX-FileCopyrightText: 2019 Marino Faggiana
-// SPDX-License-Identifier: GPL-3.0-or-later
+//
+//  NCActivity.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 17/01/2019.
+//  Copyright © 2019 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//  Author Henrik Storch <henrik.storch@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
 
 import UIKit
 import SwiftRichString
@@ -21,6 +41,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
     let database = NCManageDatabase.shared
     var allItems: [DateCompareable] = []
     var sectionDates: [Date] = []
+    var dataSourceTask: URLSessionTask?
 
     var insets = UIEdgeInsets(top: 8, left: 0, bottom: 0, right: 0)
     var didSelectItemEnable: Bool = true
@@ -29,14 +50,11 @@ class NCActivity: UIViewController, NCSharePagingContent {
 
     var isFetchingActivity = false
     var hasActivityToLoad = true {
-        didSet {
-            tableView.tableFooterView?.isHidden = hasActivityToLoad
-        }
+        didSet { tableView.tableFooterView?.isHidden = hasActivityToLoad }
     }
     var dateAutomaticFetch: Date?
     private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
 
-    @MainActor
     var session: NCSession.Session {
         if account.isEmpty {
             NCSession.shared.getSession(controller: tabBarController)
@@ -55,7 +73,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        navigationController?.setNavigationBarAppearance()
+        self.navigationController?.navigationBar.prefersLargeTitles = true
         view.backgroundColor = .systemBackground
         self.title = NSLocalizedString("_activity_", comment: "")
 
@@ -76,14 +94,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
         commentView = Bundle.main.loadNibNamed("NCActivityCommentView", owner: self, options: nil)?.first as? NCActivityCommentView
         commentView?.setup(account: metadata.account) { newComment in
             guard let newComment = newComment, !newComment.isEmpty, let metadata = self.metadata else { return }
-            NextcloudKit.shared.putComments(fileId: metadata.fileId, message: newComment, account: metadata.account) { task in
-                Task {
-                    let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: metadata.account,
-                                                                                                path: metadata.fileId,
-                                                                                                name: "putComments")
-                    await NCNetworking.shared.networkingTasks.track(identifier: identifier, task: task)
-                }
-            } completion: { _, _, error in
+            NextcloudKit.shared.putComments(fileId: metadata.fileId, message: newComment, account: metadata.account) { _, _, error in
                 if error == .success {
                     self.commentView?.newCommentField.text?.removeAll()
                     self.loadComments()
@@ -109,12 +120,9 @@ class NCActivity: UIViewController, NCSharePagingContent {
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
 
-        Task {
-            await NCNetworking.shared.networkingTasks.cancel(identifier: "NCActivity")
-        }
-
         // Cancel Queue & Retrieves Properties
         NCNetworking.shared.downloadThumbnailActivityQueue.cancelAll()
+        dataSourceTask?.cancel()
     }
 
     override func viewWillLayoutSubviews() {
@@ -234,8 +242,8 @@ extension NCActivity: UITableViewDataSource {
             cell.avatarImage?.image = results.image
         }
 
-        if let tblAvatar = results.tblAvatar,
-           !tblAvatar.loaded,
+        if let tableAvatar = results.tableAvatar,
+           !tableAvatar.loaded,
            NCNetworking.shared.downloadAvatarQueue.operations.filter({ ($0 as? NCOperationDownloadAvatar)?.fileName == fileName }).isEmpty {
             NCNetworking.shared.downloadAvatarQueue.addOperation(NCOperationDownloadAvatar(user: comment.actorId, fileName: fileName, account: account, view: tableView))
         }
@@ -307,7 +315,7 @@ extension NCActivity: UITableViewDataSource {
                 cell.avatar?.image = results.image
             }
 
-            if !(results.tblAvatar?.loaded ?? false),
+            if !(results.tableAvatar?.loaded ?? false),
                NCNetworking.shared.downloadAvatarQueue.operations.filter({ ($0 as? NCOperationDownloadAvatar)?.fileName == fileName }).isEmpty {
                 NCNetworking.shared.downloadAvatarQueue.addOperation(NCOperationDownloadAvatar(user: activity.user, fileName: fileName, account: session.account, view: tableView))
             }
@@ -331,7 +339,7 @@ extension NCActivity: UITableViewDataSource {
             for key in keys {
                 if let result = database.getActivitySubjectRich(account: session.account, idActivity: activity.idActivity, key: key) {
                     orderKeysId.append(result.id)
-                    subject = subject.replacingOccurrences(of: "{\(key)}", with: "<bold>" + result.name.escapedForMarkup + "</bold>")
+                    subject = subject.replacingOccurrences(of: "{\(key)}", with: "<bold>" + result.name + "</bold>")
                 }
             }
 
@@ -370,8 +378,12 @@ extension NCActivity {
     func fetchAll(isInitial: Bool) {
         guard !isFetchingActivity else { return }
         self.isFetchingActivity = true
+        var bottom: CGFloat = 0
 
-        NCActivityIndicator.shared.start(backgroundView: self.view, style: .medium)
+        if let mainTabBar = self.tabBarController?.tabBar as? NCMainTabBar {
+           bottom = -mainTabBar.getHeight()
+        }
+        NCActivityIndicator.shared.start(backgroundView: self.view, bottom: bottom - 35, style: .medium)
 
         let dispatchGroup = DispatchGroup()
         loadComments(disptachGroup: dispatchGroup)
@@ -418,14 +430,7 @@ extension NCActivity {
         guard showComments, let metadata = metadata else { return }
         disptachGroup?.enter()
 
-        NextcloudKit.shared.getComments(fileId: metadata.fileId, account: metadata.account) { task in
-            Task {
-                let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: metadata.account,
-                                                                                            path: metadata.fileId,
-                                                                                            name: "getComments")
-                await NCNetworking.shared.networkingTasks.track(identifier: identifier, task: task)
-            }
-        } completion: { _, comments, _, error in
+        NextcloudKit.shared.getComments(fileId: metadata.fileId, account: metadata.account) { _, comments, _, error in
             if error == .success, let comments = comments {
                 self.database.addComments(comments, account: metadata.account, objectId: metadata.fileId)
             } else if error.errorCode != NCGlobal.shared.errorResourceNotFound {
@@ -446,29 +451,21 @@ extension NCActivity {
 
     /// Check if most recent activivities are loaded, if not trigger reload
     func checkRecentActivity(disptachGroup: DispatchGroup) {
-        Task {
-            // If is already in-flight, do nothing
-            if await NCNetworking.shared.networkingTasks.isReading(identifier: "NCActivity") {
-                return
-            }
-        }
-
         guard let result = database.getLatestActivityId(account: session.account), metadata == nil, hasActivityToLoad else {
             return self.loadActivity(idActivity: 0, disptachGroup: disptachGroup)
         }
         let resultActivityId = max(result.activityFirstKnown, result.activityLastGiven)
 
         disptachGroup.enter()
 
-        NextcloudKit.shared.getActivity(since: 0,
-                                        limit: 1,
-                                        objectId: nil,
-                                        objectType: objectType,
-                                        previews: true,
-                                        account: session.account) { task in
-                Task {
-                    await NCNetworking.shared.networkingTasks.track(identifier: "NCActivity", task: task)
-                }
+        NextcloudKit.shared.getActivity(
+            since: 0,
+            limit: 1,
+            objectId: nil,
+            objectType: objectType,
+            previews: true,
+            account: session.account) { task in
+                self.dataSourceTask = task
             } completion: { account, _, activityFirstKnown, activityLastGiven, _, error in
                 defer { disptachGroup.leave() }
 
@@ -486,21 +483,18 @@ extension NCActivity {
     }
 
     func loadActivity(idActivity: Int, limit: Int = 200, disptachGroup: DispatchGroup) {
-        guard hasActivityToLoad else {
-            return
-        }
+        guard hasActivityToLoad else { return }
         var resultActivityId = 0
 
         disptachGroup.enter()
-        NextcloudKit.shared.getActivity(since: idActivity,
-                                        limit: min(limit, 200),
-                                        objectId: metadata?.fileId,
-                                        objectType: objectType,
-                                        previews: true,
-                                        account: session.account) { task in
-                Task {
-                    await NCNetworking.shared.networkingTasks.track(identifier: "NCActivity", task: task)
-                }
+        NextcloudKit.shared.getActivity(
+            since: idActivity,
+            limit: min(limit, 200),
+            objectId: metadata?.fileId,
+            objectType: objectType,
+            previews: true,
+            account: session.account) { task in
+                self.dataSourceTask = task
             } completion: { account, activities, activityFirstKnown, activityLastGiven, _, error in
                 defer { disptachGroup.leave() }
                 guard error == .success,
@@ -544,26 +538,22 @@ extension NCActivity: NCShareCommentsCellDelegate {
         guard let tableComment = tableComment else {
             return
         }
-        self.showProfileMenu(userId: tableComment.actorId, session: session, sender: sender)
+        self.showProfileMenu(userId: tableComment.actorId, session: session)
     }
 
     func tapMenu(with tableComments: tableComments?, sender: Any) {
-        toggleMenu(with: tableComments, sender: sender)
+        toggleMenu(with: tableComments)
     }
 
-    func toggleMenu(with tableComments: tableComments?, sender: Any) {
+    func toggleMenu(with tableComments: tableComments?) {
         var actions = [NCMenuAction]()
 
         actions.append(
             NCMenuAction(
                 title: NSLocalizedString("_edit_comment_", comment: ""),
                 icon: utility.loadImage(named: "pencil", colors: [NCBrandColor.shared.iconImageColor]),
-                sender: sender,
                 action: { _ in
-                    guard let metadata = self.metadata,
-                          let tableComments = tableComments else {
-                        return
-                    }
+                    guard let metadata = self.metadata, let tableComments = tableComments else { return }
 
                     let alert = UIAlertController(title: NSLocalizedString("_edit_comment_", comment: ""), message: nil, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .cancel, handler: nil))
@@ -575,14 +565,7 @@ extension NCActivity: NCShareCommentsCellDelegate {
                     alert.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in
                         guard let message = alert.textFields?.first?.text, !message.isEmpty else { return }
 
-                        NextcloudKit.shared.updateComments(fileId: metadata.fileId, messageId: tableComments.messageId, message: message, account: metadata.account) { task in
-                            Task {
-                                let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: metadata.account,
-                                                                                                            path: metadata.fileId,
-                                                                                                            name: "updateComments")
-                                await NCNetworking.shared.networkingTasks.track(identifier: identifier, task: task)
-                            }
-                        } completion: { _, _, error in
+                        NextcloudKit.shared.updateComments(fileId: metadata.fileId, messageId: tableComments.messageId, message: message, account: metadata.account) { _, _, error in
                             if error == .success {
                                 self.loadComments()
                             } else {
@@ -604,19 +587,11 @@ extension NCActivity: NCShareCommentsCellDelegate {
             NCMenuAction(
                 title: NSLocalizedString("_delete_comment_", comment: ""),
                 destructive: true,
-                icon: utility.loadImage(named: "trashIcon", colors: [.red]),
-                sender: sender,
+                icon: utility.loadImage(named: "trash", colors: [.red]),
                 action: { _ in
                     guard let metadata = self.metadata, let tableComments = tableComments else { return }
 
-                    NextcloudKit.shared.deleteComments(fileId: metadata.fileId, messageId: tableComments.messageId, account: metadata.account) { task in
-                        Task {
-                            let identifier = await NCNetworking.shared.networkingTasks.createIdentifier(account: metadata.account,
-                                                                                                        path: metadata.fileId,
-                                                                                                        name: "deleteComments")
-                            await NCNetworking.shared.networkingTasks.track(identifier: identifier, task: task)
-                        }
-                    } completion: { _, _, error in
+                    NextcloudKit.shared.deleteComments(fileId: metadata.fileId, messageId: tableComments.messageId, account: metadata.account) { _, _, error in
                         if error == .success {
                             self.loadComments()
                         } else {
@@ -631,6 +606,6 @@ extension NCActivity: NCShareCommentsCellDelegate {
             )
         )
 
-        presentMenu(with: actions, sender: sender)
+        presentMenu(with: actions)
     }
 }

iOSClient/Activity/NCActivity.swift

@@ -28,6 +28,7 @@ extension DateFormatter {
     static let shareExpDate: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.formatterBehavior = .behavior10_4
+//        dateFormatter.locale = Locale.current
         dateFormatter.dateStyle = .medium
         dateFormatter.dateFormat = NCShareAdvancePermission.displayDateFormat
         return dateFormatter
@@ -97,9 +98,13 @@ extension DateFormatter {
 }
 
 extension Date {
-   static var tomorrow:  Date { return Date().dayAfter }
-   static var today: Date {return Date()}
-   var dayAfter: Date {
+    static var tomorrow:  Date { return Date().dayAfter }
+    static var today: Date {return Date()}
+    static var dayAfterYear:  Date { return Date().dateAfterYear }
+    var dayAfter: Date {
       return Calendar.current.date(byAdding: .day, value: 1, to: Date())!
-   }
+    }
+    var dateAfterYear: Date {
+       return Calendar.current.date(byAdding: .year, value: 1, to: Date())!
+    }
 }

iOSClient/Extensions/DateFormatter+Extension.swift

@@ -37,7 +37,7 @@ extension UIToolbar {
             buttons.append(clearButton)
         }
         buttons.append(UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.flexibleSpace, target: nil, action: nil))
-        let doneButton = UIBarButtonItem(title: NSLocalizedString("_done_", comment: ""), style: .plain) {
+        let doneButton = UIBarButtonItem(title: NSLocalizedString("_done_", comment: ""), style: .done) {
             onDone()
         }
         buttons.append(doneButton)