Преглед изворни кода

Show indicator for muted conversations

Danilo Bargen пре 7 година
родитељ
комит
8afb18ac10

+ 2 - 1
public/i18n/de.json

@@ -157,7 +157,8 @@
         "THREEMA_WORK_CONTACT": "Threema Work Nutzer",
         "THREEMA_BLOCKED_RECEIVER": "blockiert",
         "DELETE_THREAD": "Chat löschen",
-        "DELETE_THREAD_MESSAGE": "{count, plural, one {Möchten Sie wirklich diesen Chat löschen? Die Nachrichten können nicht wiederhergestellt werden.} other {Möchten Sie wirklich # Chats löschen? Die Nachrichten können nicht wiederhergestellt werden.}}"
+        "DELETE_THREAD_MESSAGE": "{count, plural, one {Möchten Sie wirklich diesen Chat löschen? Die Nachrichten können nicht wiederhergestellt werden.} other {Möchten Sie wirklich # Chats löschen? Die Nachrichten können nicht wiederhergestellt werden.}}",
+        "MUTED": "Keine Benachrichtigungen"
     },
     "messageTypes": {
         "AUDIO_MESSAGE": "Sprachnachricht",

+ 2 - 1
public/i18n/en.json

@@ -157,7 +157,8 @@
         "THREEMA_WORK_CONTACT": "Threema Work user",
         "THREEMA_BLOCKED_RECEIVER": "blocked",
         "DELETE_THREAD": "Delete chat",
-        "DELETE_THREAD_MESSAGE": "{count, plural, one {Do you really want to delete this chat? You will not be able to recover the messages.} other {Do you really want to delete # chat(s)? You will not be able to recover the messages.}}"
+        "DELETE_THREAD_MESSAGE": "{count, plural, one {Do you really want to delete this chat? You will not be able to recover the messages.} other {Do you really want to delete # chat(s)? You will not be able to recover the messages.}}",
+        "MUTED": "No notifications"
     },
     "messageTypes": {
         "AUDIO_MESSAGE": "Audio Message",

+ 4 - 1
src/partials/messenger.navigation.html

@@ -77,7 +77,10 @@
 
             <section class="conversation-box">
                 <section class="receiver-box">
-                    <span ng-class="{'disabled': conversation.receiver.disabled === true}" ng-bind-html="conversation.receiver.displayName | escapeHtml | emojify">
+                    <span class="title" ng-class="{'disabled': conversation.receiver.disabled === true}" ng-bind-html="conversation.receiver.displayName | escapeHtml | emojify">
+                    </span>
+                    <span class="muted" ng-show="conversation.isMuted">
+                        <i class="material-icons md-dark" translate translate-attr-title="messenger.MUTED">do_not_disturb_on</i>
                     </span>
                     <span class="badge unread-count" ng-show="conversation.unreadCount > 0">
                         {{ conversation.unreadCount }}

+ 13 - 1
src/sass/sections/_navigation.scss

@@ -119,7 +119,7 @@
                 justify-content: space-between;
                 font-weight: bold;
                 color: black;
-                :first-child {
+                .title {
                     flex: 1;
                     white-space: nowrap;
                     overflow: hidden;
@@ -129,6 +129,17 @@
                 .disabled {
                     text-decoration: line-through;
                 }
+                .muted {
+                    margin: 1px 0 0 4px;
+                    padding: 0;
+                    height: 20px;
+                    i {
+                        color: $material-grey;
+                        font-size: 20px;
+                        margin: 0;
+                        padding: 0;
+                    }
+                }
             }
 
             .message-box {
@@ -218,6 +229,7 @@
             color: white;
             font-size: 0.9em;
             padding: 0 5px;
+            margin-left: 4px;
         }
     }