From 6e18eab9f8ee97d8c0e6c0c166adea7f77169117 Mon Sep 17 00:00:00 2001
From: adb <info@adb.sh>
Date: Tue, 16 Mar 2021 11:52:38 +0100
Subject: [PATCH] update user and room icons

---
 package.json                       |  2 ++
 src/components/chatInformation.vue | 11 +++++----
 src/components/newMessage.vue      | 15 ++++++------
 src/components/topBanner.vue       | 29 ++++++++++++++++-------
 src/components/userThumbnail.vue   | 38 +++++++++++++++++-------------
 src/views/chat.vue                 | 10 ++++----
 6 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 86a9c89..8ed94cb 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
   },
   "dependencies": {
     "@modular-matrix/parse-mxc": "^1.0.1",
+    "@vue-polkadot/vue-identicon": "^0.0.8",
     "core-js": "^3.6.5",
+    "jdenticon": "^3.1.0",
     "matrix-js-sdk": "^9.1.0",
     "sass": "^1.29.0",
     "v-emoji-picker": "^2.3.1",
diff --git a/src/components/chatInformation.vue b/src/components/chatInformation.vue
index 584765c..4dc34c7 100644
--- a/src/components/chatInformation.vue
+++ b/src/components/chatInformation.vue
@@ -11,11 +11,11 @@
         </div>
         <h2 v-if="getMembers().length !== 0">members:</h2>
         <div v-for="member in getMembers().slice(0,20)" :key="member" class="contentBox" :title="member">
-          <userThumbnail :mxcURL="getUser(member).avatarUrl" :userId="member" :username="getUser(member).displayName"
-                         width="64" height="64" resizeMethod="scale" class="userThumbnail" />
+          <userThumbnail :mxcURL="getUser(member).avatarUrl" :fallback="getUser(member).displayName"
+                         class="userThumbnail" size="3"/>
           <div class="information">
             <div class="userName">{{getUser(member).displayName || member}}</div>
-            <div class="status"></div>
+            <div class="status">{{getStatus(getUser(member))}}</div>
           </div>
         </div>
         <p v-if="getMembers().length>20">and {{getMembers().length-20}} other members</p>
@@ -45,6 +45,8 @@ export default {
     },
     getMembers(){
       return Object.keys(this.room.currentState.members)
+    },
+    getStatus(){
     }
   }
 }
@@ -134,7 +136,8 @@ export default {
   position: absolute;
   left: 0;
   top: 0;
-  background-color: #42a7b9;
+  width: 3rem;
+  height: 3rem;
 }
 .information{
   position: absolute;
diff --git a/src/components/newMessage.vue b/src/components/newMessage.vue
index 2ed800a..4ed9c94 100644
--- a/src/components/newMessage.vue
+++ b/src/components/newMessage.vue
@@ -3,7 +3,7 @@
       <label for="newMessageInput"></label>
       <textarea @keyup.enter.exact="sendMessage()" @input="resizeMessageBanner()" ref="newMessageInput" id="newMessageInput" class="newMessageInput"
                 autocomplete="off" rows="1" placeholder="type a message ..." v-model="msg.content.body" />
-      <icon type="submit" title="press enter to submit" id="sendMessageBtn"
+      <icon type="submit" title="press enter to submit" class="sendMessageBtn"
             ic="./sym/ic_send_white_24px.svg" />
     </form>
 </template>
@@ -67,16 +67,16 @@ export default {
   left: 0;
   width: 100%;
   height: min-content;
-  min-height: 4rem;
+  min-height: 3.5rem;
   background-color: #1d1d1d;
   border-radius: 1rem 1rem 0 0;
 }
 .newMessageInput{
   position: relative;
-  margin-top: 1.5rem;
-  margin-bottom: 1rem;
+  margin-top: 1.25rem;
+  margin-bottom: 0.75rem;
   left: 2rem;
-  min-height: 1.25rem;
+  min-height: 1.5rem;
   max-height: 10rem;
   width: calc(100% - 7rem);
   height: 1.25rem;
@@ -90,9 +90,10 @@ export default {
   vertical-align: middle;
   font-family: Avenir, Helvetica, Arial, sans-serif;
 }
-#sendMessageBtn{
+.sendMessageBtn{
   position: absolute;
   right: 1rem;
-  bottom: 0.5rem;
+  bottom: 0.25rem;
+  background-color: unset;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/topBanner.vue b/src/components/topBanner.vue
index 4e1670e..fc5e591 100644
--- a/src/components/topBanner.vue
+++ b/src/components/topBanner.vue
@@ -2,7 +2,8 @@
   <div class="topBanner">
     <div>
       <icon @click.native="closeChat()" class="smallIcon" id="icon-arrow" ic="./sym/arrow_back-24px.svg" />
-      <div @click="openChatInfo()" class="smallIcon" id="picTop">{{room.name.substr(0,2)}}</div>
+      <userThumbnail @click.native="openChatInfo()" class="userThumbnail"
+                     :mxcURL="getUrl()" :fallback="room.roomId" :size="3"/>
       <div id="container">
         <div id="chatName">{{room.name}}</div>
         <div id="users">{{Object.keys(room.currentState.members).length}} members</div>
@@ -12,13 +13,15 @@
 </template>
 <script>
 import icon from '@/components/icon.vue';
-import main from '@/main.js';
-import matrix from '@/matrix.js';
+import {matrix} from "@/main";
+import userThumbnail from "@/components/userThumbnail";
+import sdk from 'matrix-js-sdk'
 
 export default {
   name: "topBanner",
   components:{
     icon,
+    userThumbnail
   },
   props:{
     room: [Object, undefined],
@@ -27,8 +30,16 @@ export default {
   },
   data(){
     return {
-      chatroom: main.data().chatroom,
-      session: matrix.data().session
+    }
+  },
+  methods: {
+    getRoom(roomId) {
+      return matrix.client.getRoom(roomId);
+    },
+    getUrl(){
+      let avatarState = this.room.getLiveTimeline().getState(sdk.EventTimeline.FORWARDS).getStateEvents("m.room.avatar");
+      return avatarState.length>0?avatarState[avatarState.length-1].getContent().url:undefined;
+     //return this.room.getLiveTimeline().getStateEvents("m.room.avatar");
     }
   }
 }
@@ -39,7 +50,7 @@ export default {
   top: 0;
   left: 0;
   width: 100%;
-  height: 3rem;
+  height: 3.5rem;
   background-color: #1d1d1d;
 }
 .smallIcon{
@@ -61,10 +72,12 @@ export default {
   background-color: unset;
   box-shadow: none;
 }
-#picTop{
+.userThumbnail{
   position: absolute;
+  top: 0.25rem;
   left: 3.5rem;
-  background-color: #42a7b9;
+  width: 3rem;
+  height: 3rem;
 }
 #container{
   position: absolute;
diff --git a/src/components/userThumbnail.vue b/src/components/userThumbnail.vue
index e4a3795..eeb5a4a 100644
--- a/src/components/userThumbnail.vue
+++ b/src/components/userThumbnail.vue
@@ -1,46 +1,50 @@
 <template>
-  <img v-if="mxcURL" :src="thumbnailUrl()" class="userThumbnail" />
-  <div v-else class="userThumbnail">
-    {{username?username.substr(0,2):userId.substr(1,2)}}
-  </div>
+  <img v-if="mxcURL" :src="thumbnailUrl()" class="image"/>
+  <Identicon v-else :value="fallback" :theme="'jdenticon'" :size="this.getFontSize()*this.size" class="identicon"/>
 </template>
 
 <script>
 import parseMXC from '@modular-matrix/parse-mxc';
 import {matrix} from "@/main";
+import Identicon from '@vue-polkadot/vue-identicon';
 
 export default {
   name: "userThumbnail.vue",
+  components: {
+    Identicon
+  },
   props: {
     mxcURL: String,
     username: String,
-    userId: String,
-    width: String,
-    height: String,
-    resizeMethod: String,
-    homeserver: String
+    fallback: String,
+    homeserver: String,
+    size: Number
   },
   methods: {
     thumbnailUrl(){
       let mxc = parseMXC.parse(this.mxcURL);
-      return `${this.homeserver||matrix.baseUrl}/_matrix/media/v1/thumbnail/${mxc.homeserver}/${mxc.id}?width=${this.width}&height=${this.height}&method=${this.resizeMethod}`;
+      return `${this.homeserver||matrix.baseUrl}/_matrix/media/v1/thumbnail/${
+        mxc.homeserver}/${mxc.id}?width=${this.imageSize}&height=${this.imageSize}&method=${this.resizeMethod}`;
+    },
+    getFontSize(){
+      return window.getComputedStyle(document.body,null).fontSize.split("px", 1)||16;
     }
   },
   data(){
     return {
+      resizeMethod: 'scale',
+      imageSize: 128
     }
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .userThumbnail{
-  background-color: #42a7b9;
-  width: 3rem;
-  height: 3rem;
   border-radius: 1.5rem;
-}
-img.userThumbnail{
-  background-color: unset;
+  .image{
+    border-radius: 10rem;
+    background-color: unset;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/chat.vue b/src/views/chat.vue
index ef469b1..1853f61 100644
--- a/src/views/chat.vue
+++ b/src/views/chat.vue
@@ -12,9 +12,9 @@
               <div :class="isGroup()?'groupEvent':'eventContainer'">
                 <div class="thumbnailContainer">
                   <div class="filler"></div>
-                  <userThumbnail v-if="group[0].sender !== user && isGroup()" :userId="group[0].sender"
-                                 width="64" height="64" resizeMethod="scale" class="userThumbnail"
-                                 :mxcURL="getUser(group[0].sender).avatarUrl" />
+                  <userThumbnail v-if="group[0].sender !== user && isGroup()" :fallback="group[0].sender"
+                                 class="userThumbnail"
+                                 :mxcURL="getUser(group[0].sender).avatarUrl" :size="2"/>
                 </div>
                 <div class="username" v-if="group[0].sender !== user && isGroup()">{{getUser(group[0].sender).displayName || group[0].sender}}</div>
                 <div class="event" v-for="event in group" :key="event.origin_server_ts" :title="`${group[0].sender} at ${getTime(event.origin_server_ts)}`">
@@ -88,7 +88,7 @@ export default {
       return payload;
     },
     resize(height){
-      this.$refs.chatContainer.style.height = `calc(100% - ${height}px - 3rem)`;
+      this.$refs.chatContainer.style.height = `calc(100% - ${height}px - 3.5rem)`;
     },
     isGroup(){
       return Object.keys(this.room.currentState.members).length > 2;
@@ -129,7 +129,7 @@ export default {
   position: absolute;
   margin: 0;
   left: 0;
-  top: 3rem;
+  top: 3.5rem;
   width: 100%;
   height: calc(100% - 7rem);
   .messagesContainer{