浏览代码

update user status

marinofaggiana 4 年之前
父节点
当前提交
4f8dc135c5

+ 4 - 1
iOSClient/More/NCMore.swift

@@ -56,7 +56,6 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
         self.navigationItem.title = NSLocalizedString("_more_", comment: "")
 
-        //
         tableView.register(UINib.init(nibName: "NCMoreUserCell", bundle: nil), forCellReuseIdentifier: "userCell")
         
         // create tap gesture recognizer
@@ -229,6 +228,10 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         let quotaUsed: String = CCUtility.transformedSize(Double(tabAccount.quotaUsed))
 
         labelQuota.text = String.localizedStringWithFormat(NSLocalizedString("_quota_using_", comment: ""), quotaUsed, quota)
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            self.tableView.reloadData()
+        }
     }
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

+ 6 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -150,6 +150,12 @@
 "_duration_"                = "Duration";
 "_model_"                   = "Model";
 "_set_user_status_"         = "Set user status";
+"_online_"                  = "Online";
+"_away_"                    = "Away";
+"_dnd_"                     = "Do not disturb";
+"_dnd_description_"         = "Mute all notifications";
+"_invisible_"               = "Invidible";
+"_invisible_description_"   = "Apper offline";
 
 // App
 

+ 10 - 1
iOSClient/Utility/NCUtility.swift

@@ -602,18 +602,23 @@ class NCUtility: NSObject {
         
         var onlineStatus: UIImage?
         var statusMessage: String = ""
+        var messageUserDefined: String = ""
         
         if userStatus?.lowercased() == "online" {
             onlineStatus = CCGraphics.changeThemingColorImage(UIImage.init(named: "userStatusOnline"), width: 100, height: 100, color: UIColor(red: 103.0/255.0, green: 176.0/255.0, blue: 134.0/255.0, alpha: 1.0))
+            messageUserDefined = NSLocalizedString("_online_", comment: "")
         }
         if userStatus?.lowercased() == "away" {
             onlineStatus = CCGraphics.changeThemingColorImage(UIImage.init(named: "userStatusAway"), width: 100, height: 100, color: UIColor(red: 233.0/255.0, green: 166.0/255.0, blue: 75.0/255.0, alpha: 1.0))
+            messageUserDefined = NSLocalizedString("_away_", comment: "")
         }
         if userStatus?.lowercased() == "dnd" {
             onlineStatus = UIImage.init(named: "userStatusDnd")?.resizeImageUsingVImage(size: CGSize(width: 100, height: 100))
+            messageUserDefined = NSLocalizedString("_dnd_", comment: "")
         }
         if userStatus?.lowercased() == "offline" || userStatus?.lowercased() == "invisible"  {
             onlineStatus = CCGraphics.changeThemingColorImage(UIImage.init(named: "userStatusOffline"), width: 100, height: 100, color: .black)
+            messageUserDefined = NSLocalizedString("_invisible_", comment: "")
         }
         
         if let userIcon = userIcon {
@@ -622,8 +627,12 @@ class NCUtility: NSObject {
         if let userMessage = userMessage {
             statusMessage = statusMessage + userMessage
         }
+        statusMessage = statusMessage.trimmingCharacters(in: .whitespaces)
+        if statusMessage == "" {
+            statusMessage = messageUserDefined
+        }
                 
-        return(onlineStatus, statusMessage.trimmingCharacters(in: .whitespaces))
+        return(onlineStatus, statusMessage)
     }
 }