Merge branch 'next' into devel

Author: or-else

TinodeSDK.xcodeproj/project.pbxproj

@@ -285,6 +285,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 0A431BD22244A0BE00A837F7;
 			productRefGroup = 0A431BDD2244A0BE00A837F7 /* Products */;

Tinodios.xcodeproj/project.pbxproj

@@ -196,8 +196,10 @@
 		B02F5C8A22679BC80079A97E /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		B031BE542263075E004160AE /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		B05ACEB222FDAB5200276713 /* ResetPasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetPasswordViewController.swift; sourceTree = "<group>"; };
-		B0762A9F244EE94300385B65 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
 		B079062423EEA0C90019ED75 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		B093F50126C5BBF300FAA4E8 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		B093F50426C5BD4200FAA4E8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
+		B093F50526C5BD8800FAA4E8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B0941BC42487CEE100A891B7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
 		B0941BC52487CEE100A891B7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		B0941BC62487CEE100A891B7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -222,7 +224,6 @@
 		B0CEF8DA26B603E3000028C2 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		B0CEF8DB26B603E4000028C2 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B0CF83DD244DFB1C00E79D22 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
-		B0CF83E1244E074A00E79D22 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B0CF83E3244E074E00E79D22 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		B0DF03162279F027000F9492 /* RoundImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundImageView.swift; sourceTree = "<group>"; };
 		B0DF0318227C2517000F9492 /* MessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageView.swift; sourceTree = "<group>"; };
@@ -725,10 +726,10 @@
 			children = (
 				0A0380DC21B3CC8100A3FA0E /* Base */,
 				B0CF83DD244DFB1C00E79D22 /* zh-Hans */,
-				B0762A9F244EE94300385B65 /* en */,
 				B0941BC42487CEE100A891B7 /* es */,
 				B0CEF8D726B5EC21000028C2 /* zh-Hant */,
 				B0CEF8D926B603E3000028C2 /* ru */,
+				B093F50426C5BD4200FAA4E8 /* en */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -748,10 +749,11 @@
 		B0CF83E2244E074A00E79D22 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				B0CF83E1244E074A00E79D22 /* en */,
 				B0CF83E3244E074E00E79D22 /* zh-Hans */,
 				B0941BC62487CEE100A891B7 /* es */,
 				B0CEF8DB26B603E4000028C2 /* ru */,
+				B093F50126C5BBF300FAA4E8 /* zh-Hant */,
+				B093F50526C5BD8800FAA4E8 /* en */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";

Tinodios/Base.lproj/Main.storyboard

@@ -11,8 +11,8 @@ import TinodiosDB
 
 class TopicInfoViewController: UITableViewController {
 
-    // Number of rows in every section. '-1' means variable number of items
     private static let kSectionBasic = 0
+    private static let kSectionBasicLastSeen = 2
 
     private static let kSectionMute = 1
 
@@ -42,6 +42,7 @@ class TopicInfoViewController: UITableViewController {
     @IBOutlet weak var loadAvatarButton: UIButton!
     @IBOutlet weak var mutedSwitch: UISwitch!
     @IBOutlet weak var topicIDLabel: UILabel!
+    @IBOutlet weak var lastSeenTimestampLabel: UILabel!
 
     @IBOutlet weak var actionMyPermissions: UITableViewCell!
     @IBOutlet weak var myPermissionsLabel: UILabel!
@@ -191,6 +192,20 @@ class TopicInfoViewController: UITableViewController {
         mutedSwitch.isOn = topic.isMuted
         let acs = topic.accessMode
 
+        if let ts = topic?.lastSeen?.when {
+            var date: String
+            if #available(iOS 13.0, *) {
+                let formatter = RelativeDateTimeFormatter()
+                formatter.unitsStyle = .short
+                date = formatter.localizedString(for: ts, relativeTo: Date())
+            } else {
+                // Fallback on earlier versions
+                date = RelativeDateFormatter.shared.shortDate(from: ts)
+            }
+
+            self.lastSeenTimestampLabel?.text = date
+        }
+
         if self.topic.isGrpType {
             authUsersPermissionsLabel?.text = topic.defacs?.getAuth()
             anonUsersPermissionsLabel?.text = topic.defacs?.getAnon()
@@ -474,9 +489,9 @@ extension TopicInfoViewController {
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == TopicInfoViewController.kSectionMembers && indexPath.row != 0 {
             return 60
-        }
-
-        if indexPath.section == TopicInfoViewController.kSectionActions {
+        } else if indexPath.section == TopicInfoViewController.kSectionBasic && indexPath.row == TopicInfoViewController.kSectionBasicLastSeen && topic?.lastSeen == nil {
+            return CGFloat.leastNonzeroMagnitude
+        } else if indexPath.section == TopicInfoViewController.kSectionActions {
             if indexPath.row == TopicInfoViewController.kSectionActionsManageTags && (!(topic?.isGrpType ?? false) || !(topic?.isOwner ?? false)) {
                 // P2P topic has no owner, hide [Manage Tags]
                 return CGFloat.leastNonzeroMagnitude

Tinodios/TopicInfoViewController.swift

@@ -14,11 +14,11 @@
 /* Class = "UITableViewSection"; headerTitle = "Group Members"; ObjectID = "26s-2T-nI0"; */
 "26s-2T-nI0.headerTitle" = "Group Members";
 
-/* Class = "UITableViewSection"; headerTitle = "Notifications"; ObjectID = "3gX-G0-wiF"; */
+/*  */
 "3gX-G0-wiF.headerTitle" = "Notifications";
 
-/* Class = "UIBarButtonItem"; title = "Item"; ObjectID = "3zN-CC-6bS"; */
-"3zN-CC-6bS.title" = "Item";
+/* Class = "UITableViewController"; title = "General Settings"; ObjectID = "4dd-0I-UFm"; */
+"4dd-0I-UFm.title" = "General Settings";
 
 /* Class = "UILabel"; text = "Send typing notifications"; ObjectID = "4ll-eW-b8Z"; */
 "4ll-eW-b8Z.text" = "Send typing notifications";
@@ -107,6 +107,12 @@
 /* Class = "UIBarButtonItem"; title = "New Chat"; ObjectID = "LVG-dB-flA"; */
 "LVG-dB-flA.title" = "New Chat";
 
+/* Class = "UILabel"; text = "Blocked contacts"; ObjectID = "Lh9-1X-ez1"; */
+"Lh9-1X-ez1.text" = "Blocked contacts";
+
+/* Class = "UINavigationItem"; title = "Notifications"; ObjectID = "O9h-LB-2lW"; */
+"O9h-LB-2lW.title" = "Notifications";
+
 /* Class = "UILabel"; text = "Content type:"; ObjectID = "OeG-Kx-gwG"; */
 "OeG-Kx-gwG.text" = "Content type:";
 
@@ -116,6 +122,9 @@
 /* Class = "UITableViewController"; title = "Account Settings"; ObjectID = "Pnk-9m-ZVg"; */
 "Pnk-9m-ZVg.title" = "Account Settings";
 
+/* Class = "UILabel"; text = "First and Last Name"; ObjectID = "PuQ-zO-4Of"; */
+"PuQ-zO-4Of.text" = "First and Last Name";
+
 /* Class = "UILabel"; text = "Topic or user ID"; ObjectID = "RA0-dx-dSp"; */
 "RA0-dx-dSp.text" = "Topic or user ID";
 
@@ -125,9 +134,15 @@
 /* Class = "UIButton"; normalTitle = "Sign up"; ObjectID = "Rv6-qQ-FqW"; */
 "Rv6-qQ-FqW.normalTitle" = "Sign up";
 
+/* Class = "UIButton"; normalTitle = "Add Avatar"; ObjectID = "Svo-WC-LXa"; */
+"Svo-WC-LXa.normalTitle" = "Add Avatar";
+
 /* Class = "UITabBarItem"; title = "By ID"; ObjectID = "T7l-iC-Rs6"; */
 "T7l-iC-Rs6.title" = "By ID";
 
+/* Class = "UILabel"; text = "John Doe"; ObjectID = "TCK-gb-1BS"; */
+"TCK-gb-1BS.text" = "John Doe";
+
 /* Class = "UILabel"; text = "Leave Group"; ObjectID = "TRR-fA-HKj"; */
 "TRR-fA-HKj.text" = "Leave Group";
 
@@ -182,14 +197,20 @@
 /* Class = "UILabel"; text = "File name:"; ObjectID = "aA7-FA-fcf"; */
 "aA7-FA-fcf.text" = "File name:";
 
+/* Class = "UILabel"; text = "Notifications"; ObjectID = "aCk-Z4-8m7"; */
+"aCk-Z4-8m7.text" = "Notifications";
+
 /* Class = "UIButton"; normalTitle = "Confirm"; ObjectID = "aFc-MO-QyO"; */
 "aFc-MO-QyO.normalTitle" = "Confirm";
 
 /* Class = "UILabel"; text = "N"; ObjectID = "aMv-to-Vu2"; */
 "aMv-to-Vu2.text" = "N";
 
-/* Class = "UITextView"; text = "User name"; ObjectID = "bFa-Y7-bbT"; */
-"bFa-Y7-bbT.text" = "User name";
+/* Class = "UILabel"; text = "Last active"; ObjectID = "bEA-WA-uoH"; */
+"bEA-WA-uoH.text" = "Last active";
+
+/*  */
+"bFa-Y7-bbT.text" = "Username";
 
 /* Class = "UILabel"; text = "N"; ObjectID = "bZv-2Q-BI9"; */
 "bZv-2Q-BI9.text" = "N";
@@ -200,6 +221,9 @@
 /* Class = "UILabel"; text = " MyUID"; ObjectID = "bvN-my-ZPi"; */
 "bvN-my-ZPi.text" = " MyUID";
 
+/* Class = "UINavigationItem"; title = "Help and About"; ObjectID = "d7l-9Y-8mk"; */
+"d7l-9Y-8mk.title" = "Help and About";
+
 /* Class = "UILabel"; text = "Manage"; ObjectID = "eHa-mE-ZbY"; */
 "eHa-mE-ZbY.text" = "Manage";
 
@@ -212,6 +236,9 @@
 /* Class = "UINavigationItem"; title = "Archived chats"; ObjectID = "fP4-sa-3Wz"; */
 "fP4-sa-3Wz.title" = "Archived chats";
 
+/* Class = "UILabel"; text = "Help and About"; ObjectID = "fPM-Ht-gZz"; */
+"fPM-Ht-gZz.text" = "Help and About";
+
 /* Class = "UILabel"; text = "ALL USERS"; ObjectID = "ftJ-J6-tqx"; */
 "ftJ-J6-tqx.text" = "ALL USERS";
 
@@ -227,8 +254,14 @@
 /* Class = "UILabel"; text = "Send read receipts"; ObjectID = "geh-gC-6qO"; */
 "geh-gC-6qO.text" = "Send read receipts";
 
-/* Class = "UINavigationItem"; title = "New chat"; ObjectID = "hZA-k4-xku"; */
-"hZA-k4-xku.title" = "New chat";
+/* Class = "UINavigationItem"; title = "Blocked Contacts"; ObjectID = "hTR-e8-PeX"; */
+"hTR-e8-PeX.title" = "Blocked Contacts";
+
+/* Class = "UINavigationItem"; title = "Personal"; ObjectID = "hUo-8f-ZiA"; */
+"hUo-8f-ZiA.title" = "Personal";
+
+/* Class = "UINavigationItem"; title = "New Chat"; ObjectID = "hZA-k4-xku"; */
+"hZA-k4-xku.title" = "New Chat";
 
 /* Class = "UIButton"; normalTitle = "Request"; ObjectID = "i0f-S8-O1v"; */
 "i0f-S8-O1v.normalTitle" = "Request";
@@ -266,6 +299,9 @@
 /* Class = "UILabel"; text = "N"; ObjectID = "mTa-Ke-dom"; */
 "mTa-Ke-dom.text" = "N";
 
+/* Class = "UINavigationItem"; title = "Account and Security"; ObjectID = "mV4-Fq-kmc"; */
+"mV4-Fq-kmc.title" = "Account and Security";
+
 /* Class = "UILabel"; text = "Size: "; ObjectID = "moa-6V-LhX"; */
 "moa-6V-LhX.text" = "Size: ";
 
@@ -287,10 +323,10 @@
 /* Class = "UINavigationController"; title = "StartNavigationController"; ObjectID = "oPa-Qr-HlP"; */
 "oPa-Qr-HlP.title" = "StartNavigationController";
 
-/* Class = "UILabel"; text = "TopicID"; ObjectID = "om5-K5-yRq"; */
+/*  */
 "om5-K5-yRq.text" = "TopicID";
 
-/* Class = "UITableViewSection"; headerTitle = "General"; ObjectID = "out-KF-2FK"; */
+/*  */
 "out-KF-2FK.headerTitle" = "General";
 
 /* Class = "UIButton"; normalTitle = "Forgot password?"; ObjectID = "q6T-TC-n42"; */
@@ -320,6 +356,9 @@
 /* Class = "UILabel"; text = "N"; ObjectID = "s6S-ku-F63"; */
 "s6S-ku-F63.text" = "N";
 
+/* Class = "UILabel"; text = "This is a channel"; ObjectID = "skU-B7-Zed"; Note = "Label for channel switch"; */
+"skU-B7-Zed.text" = "This is a channel";
+
 /* Class = "UILabel"; text = "John Doe"; ObjectID = "syF-Vp-vRc"; */
 "syF-Vp-vRc.text" = "John Doe";
 
@@ -356,6 +395,12 @@
 /* Class = "UITextField"; placeholder = "First and last name"; ObjectID = "yKx-xt-rdn"; */
 "yKx-xt-rdn.placeholder" = "First and last name";
 
+/* Class = "UILabel"; text = "Subtitle"; ObjectID = "yL1-ka-zNK"; */
+"yL1-ka-zNK.text" = "Subtitle";
+
+/* Class = "UILabel"; text = "Account and Security"; ObjectID = "z08-iK-CeG"; */
+"z08-iK-CeG.text" = "Account and Security";
+
 /* Class = "UILabel"; text = "Delete Group"; ObjectID = "z6C-JF-Mnb"; */
 "z6C-JF-Mnb.text" = "Delete Group";