minor UI fixes

tinode · Mar 7, 2022 · f5fa87d · f5fa87d
1 parent 256fb34
commit f5fa87d
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 7 deletions.
diff --git a/Localizations/en.xcloc/Localized Contents/en.xliff b/Localizations/en.xcloc/Localized Contents/en.xliff
@@ -624,6 +624,11 @@
         <target>confirm</target>
         <note>Button text</note>
       </trans-unit>
+      <trans-unit id="online now" xml:space="preserve">
+        <source>online now</source>
+        <target>online now</target>
+        <note>The topic or user is currently online</note>
+      </trans-unit>
       <trans-unit id="undefined" xml:space="preserve">
         <source>undefined</source>
         <target>undefined</target>

diff --git a/Localizations/es.xcloc/Localized Contents/es.xliff b/Localizations/es.xcloc/Localized Contents/es.xliff
@@ -624,6 +624,11 @@
         <target>confirmar</target>
         <note>Button text</note>
       </trans-unit>
+      <trans-unit id="online now" xml:space="preserve">
+        <source>online now</source>
+        <target>en línea ahora</target>
+        <note>The topic or user is currently online</note>
+      </trans-unit>
       <trans-unit id="undefined" xml:space="preserve">
         <source>undefined</source>
         <target>indefinido</target>

diff --git a/Localizations/ru.xcloc/Localized Contents/ru.xliff b/Localizations/ru.xcloc/Localized Contents/ru.xliff
@@ -624,6 +624,11 @@
         <target>подтвердить</target>
         <note>Button text</note>
       </trans-unit>
+      <trans-unit id="online now" xml:space="preserve">
+        <source>online now</source>
+        <target>сейчас онлайн</target>
+        <note>The topic or user is currently online</note>
+      </trans-unit>
       <trans-unit id="undefined" xml:space="preserve">
         <source>undefined</source>
         <target>без названия</target>

diff --git a/Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff
@@ -624,6 +624,11 @@
         <target>确认</target>
         <note>Button text</note>
       </trans-unit>
+      <trans-unit id="online now" xml:space="preserve">
+        <source>online now</source>
+        <target>现在在线</target>
+        <note>The topic or user is currently online</note>
+      </trans-unit>
       <trans-unit id="undefined" xml:space="preserve">
         <source>undefined</source>
         <target>未定义</target>

diff --git a/Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff b/Localizations/zh-Hant.xcloc/Localized Contents/zh-Hant.xliff
@@ -624,6 +624,11 @@
         <target>確認</target>
         <note>Button text</note>
       </trans-unit>
+      <trans-unit id="online now" xml:space="preserve">
+        <source>online now</source>
+        <target>現在線上</target>
+        <note>The topic or user is currently online</note>
+      </trans-unit>
       <trans-unit id="undefined" xml:space="preserve">
         <source>undefined</source>
         <target>未定義</target>

diff --git a/Tinodios/TopicGeneralViewController.swift b/Tinodios/TopicGeneralViewController.swift
@@ -79,12 +79,13 @@ class TopicGeneralViewController: UITableViewController {
     private func reloadData() {
         topicTitleLabel.text = (topic.pub?.fn ?? "").isEmpty ? NSLocalizedString("Unknown", comment: "Placeholder for missing user name") : topic.pub?.fn
 
-        topicDescriptionLabel.textColor = topic?.pub?.note?.isEmpty ?? true ? .placeholderText : .secondaryLabel
-        if topic.isOwner {
+        let isEmpty = topic?.pub?.note?.isEmpty ?? true
+        topicDescriptionLabel.textColor = isEmpty ? .placeholderText : .secondaryLabel
+        if topic.isOwner || !isEmpty {
             topicDescriptionLabel.isHidden = false
-            topicDescriptionLabel.text = (topic.pub?.note ?? "").isEmpty ? NSLocalizedString("Add optional description", comment: "Placeholder for missing topic description") : topic.pub?.note
+            topicDescriptionLabel.text = isEmpty ? NSLocalizedString("Add optional description", comment: "Placeholder for missing topic description") : topic.pub?.note
         } else {
-            topicDescriptionLabel.isHidden = topic?.pub?.note?.isEmpty ?? true
+            topicDescriptionLabel.isHidden = true
         }
 
         topicPrivateLabel.textColor = topic?.comment?.isEmpty ?? true ? .placeholderText : .secondaryLabel

diff --git a/Tinodios/TopicInfoViewController.swift b/Tinodios/TopicInfoViewController.swift
@@ -76,10 +76,12 @@ class TopicInfoViewController: UITableViewController {
         topicTitleTextView.sizeToFit()
 
         let descPlaceholder: String? = topic.isOwner ? NSLocalizedString("Add optional description", comment: "Placeholder for missing topic description") : nil
-        topicDescriptionTextView.text = !(topic.pub?.note ?? "").isEmpty ? descPlaceholder : topic.pub?.note
+        topicDescriptionTextView.textColor = (topic.pub?.note ?? "").isEmpty ? .placeholderText : .secondaryLabel
+        topicDescriptionTextView.text = (topic.pub?.note ?? "").isEmpty ? descPlaceholder : topic.pub?.note
         topicDescriptionTextView.sizeToFit()
 
-        topicPrivateTextView.text = !(topic.comment ?? "").isEmpty ? NSLocalizedString("Private info: not set", comment: "Placeholder text in editor") : topic.comment
+        topicPrivateTextView.textColor = (topic.comment ?? "").isEmpty ? .placeholderText : .secondaryLabel
+        topicPrivateTextView.text = (topic.comment ?? "").isEmpty ? NSLocalizedString("Private info: not set", comment: "Placeholder text in editor") : topic.comment
         topicPrivateTextView.sizeToFit()
 
         topicIDLabel.text = topic?.name
@@ -90,7 +92,9 @@ class TopicInfoViewController: UITableViewController {
         mutedSwitch.isOn = topic.isMuted
         archivedSwitch.isOn = topic.isArchived
 
-        if let ts = topic?.lastSeen?.when {
+        if topic.online {
+            self.lastSeenTimestampLabel?.text = NSLocalizedString("online now", comment: "The topic or user is currently online")
+        } else if let ts = topic?.lastSeen?.when {
             var date: String
             let formatter = RelativeDateTimeFormatter()
             formatter.unitsStyle = .short

diff --git a/es.lproj/Localizable.strings b/es.lproj/Localizable.strings
@@ -245,6 +245,9 @@
 /* Alert action */
 "OK" = "OK";
 
+/* The topic or user is currently online */
+"online now" = "en línea ahora";
+
 /* Toast notification */
 "Only Owner can delete group" = "Sólo el propietario puede eliminar el grupo";
 

diff --git a/ru.lproj/Localizable.strings b/ru.lproj/Localizable.strings
@@ -245,6 +245,9 @@
 /* Alert action */
 "OK" = "OK";
 
+/* The topic or user is currently online */
+"online now" = "сейчас онлайн";
+
 /* Toast notification */
 "Only Owner can delete group" = "Только владелец может удалить группу";
 

diff --git a/zh-Hans.lproj/Localizable.strings b/zh-Hans.lproj/Localizable.strings
@@ -245,6 +245,9 @@
 /* Alert action */
 "OK" = "好";
 
+/* The topic or user is currently online */
+"online now" = "现在在线";
+
 /* Toast notification */
 "Only Owner can delete group" = "只有所有者可以删除组";
 

diff --git a/zh-Hant.lproj/Localizable.strings b/zh-Hant.lproj/Localizable.strings
@@ -245,6 +245,9 @@
 /* Alert action */
 "OK" = "OK";
 
+/* The topic or user is currently online */
+"online now" = "現在線上";
+
 /* Toast notification */
 "Only Owner can delete group" = "只有擁有者能夠刪除群組";