diff --git a/images/icons/add_people-24px.svg b/images/icons/add_people-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..536065ad93f67093d5547c68495741666e23472d
--- /dev/null
+++ b/images/icons/add_people-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Add people</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Add-people" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.5">
+ <g id="noun_Add-Contact_339144" transform="translate(2.000000, 4.000000)">
+ <path d="M19.0932653,11.5957143 L17.4367347,11.5879592 L17.427551,9.87755102 C17.4261224,9.48693878 17.11,9.16836735 16.7206122,9.16693878 C16.5338776,9.16693878 16.3585714,9.23979592 16.2263265,9.37367347 C16.0926531,9.5077551 16.02,9.68632653 16.0204082,9.87857143 L16.0285714,11.5810204 L14.3228571,11.5726531 C14.1320408,11.5726531 13.9532653,11.6469388 13.8197959,11.7810204 C13.6871429,11.9138776 13.614898,12.0893878 13.6159077,12.2773469 C13.6181633,12.6630612 13.9369388,12.9779592 14.3257143,12.9795918 L16.0357143,12.9883673 L16.0436735,14.6463265 C16.0463265,15.0355102 16.3616327,15.3540816 16.747551,15.3563265 L16.7506122,15.3563265 C16.9377551,15.3563265 17.1132653,15.2834694 17.245102,15.1504082 C17.3785714,15.0163265 17.452449,14.8369388 17.4508163,14.6455102 L17.4434694,12.9957143 L19.0963265,13.0036735 C19.287551,13.0036735 19.4659184,12.9297959 19.5995918,12.794898 C19.7316327,12.6626531 19.8042857,12.4861224 19.8030765,12.2995918 C19.8006122,11.9134694 19.4818367,11.5979592 19.0932653,11.5957143 Z M12.3804082,12.862449 L6.96530612,12.862449 C6.96530612,12.824898 6.96734694,12.7871429 6.9677551,12.7497959 C6.97612245,12.4061224 7.01918367,12.0712245 7.0944898,11.7493878 C7.23510204,11.1473469 7.48653061,10.5889796 7.82693878,10.0965306 C8.02795918,9.80571429 8.25938776,9.53836735 8.51632653,9.29816327 C9.38632653,8.48755102 10.5534694,7.99040816 11.8363265,7.99040816 C12.9840816,7.99040816 14.0373469,8.38795918 14.8693878,9.05020408 C14.9695918,8.82530612 15.1091837,8.61836735 15.2869388,8.43877551 C15.3493878,8.37632653 15.4153061,8.32020408 15.4834694,8.26734694 C14.9695918,7.85816327 14.3885714,7.53102041 13.7569388,7.31122449 C14.9016327,6.64734694 15.6736735,5.40714286 15.6736735,3.99081633 C15.6736735,1.87469388 13.9522449,0.154081633 11.8363265,0.154081633 C9.72142857,0.154081633 8.00102041,1.87489796 8.00102041,3.99081633 C8.00102041,5.40714286 8.77244898,6.64734694 9.91714286,7.31122449 C9.15612245,7.5755102 8.46836735,7.9944898 7.88489796,8.52714286 C7.53285714,8.18122449 7.12693878,7.89081633 6.67734694,7.67387755 C7.34469388,7.11428571 7.76959184,6.2744898 7.76959184,5.3377551 C7.76959184,3.65489796 6.40061224,2.28693878 4.71877551,2.28693878 C3.03693878,2.28693878 1.66918367,3.65530612 1.66918367,5.33816327 C1.66918367,6.2744898 2.09346939,7.1144898 2.76040816,7.67428571 C1.24530612,8.40571429 0.197142857,9.95755102 0.197142857,11.7495918 C0.197142857,12.3022449 0.645714286,12.75 1.1977551,12.75 L5.96897959,12.75 C5.96836735,12.7873469 5.9644898,12.8246939 5.9644898,12.8626531 C5.9644898,13.414898 6.41265306,13.8626531 6.96510204,13.8626531 L13.0661224,13.8626531 C12.7457143,13.6089796 12.502449,13.2618367 12.3804082,12.862449 Z M9.00122449,3.99122449 C9.00122449,2.4244898 10.2710204,1.15489796 11.8371429,1.15489796 C13.4036735,1.15489796 14.6732653,2.42489796 14.6732653,3.99122449 C14.6732653,5.5577551 13.4034694,6.82693878 11.8371429,6.82693878 C10.2710204,6.82693878 9.00122449,5.55755102 9.00122449,3.99122449 Z M2.66897959,5.33816327 C2.66897959,4.20571429 3.58673469,3.28816327 4.71857143,3.28816327 C5.85061224,3.28816327 6.76816327,4.20571429 6.76816327,5.33816327 C6.76816327,6.46938776 5.85081633,7.38755102 4.71857143,7.38755102 C3.58673469,7.38734694 2.66897959,6.46938776 2.66897959,5.33816327 Z M1.19795918,11.7493878 C1.19795918,9.80510204 2.77428571,8.2277551 4.71857143,8.2277551 C5.69102041,8.2277551 6.57102041,8.62244898 7.20836735,9.25877551 C6.64938776,9.97612245 6.25285714,10.8234694 6.07489796,11.7493878 L1.19795918,11.7493878 L1.19795918,11.7493878 Z" id="Shape"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/back-24px.svg b/images/icons/back-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b1cfd2f2793add4163f6dc62cb8f7e97a58d02d7
--- /dev/null
+++ b/images/icons/back-24px.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="<-" fill="#000000" transform="translate(2.000000, 5.000000)">
+ <path d="M0.302825536,7.53652162 L6.27862638,13.4439361 L6.37822306,13.542393 C6.77660979,13.9362206 7.47378655,13.8377637 7.77257659,13.4439361 C8.07136664,13.0501085 8.07136664,12.3609101 7.67297991,12.0655394 L3.39032264,7.83189235 L18.9274048,7.83189235 C19.5249849,7.83189235 19.9233716,7.43806472 19.9233716,6.84732327 C19.9233716,6.25658182 19.5249849,5.86275419 18.9274048,5.86275419 L3.39032264,5.86275419 L7.67297991,1.62910716 C7.97176996,1.23527953 7.97176996,0.742994993 7.67297991,0.349167363 C7.27459319,-0.0446602682 6.67701311,-0.143117176 6.27862638,0.250710455 L0.302825536,6.15812492 C0.00403549366,6.45349564 -0.0955611871,6.84732327 0.103632174,7.2411509 C0.103632174,7.33960781 0.203228855,7.43806472 0.302825536,7.53652162" id="Fill-1"></path>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/message_audio-24px.svg b/images/icons/message_audio-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..880e617c549b51cb778d9f1699c539a62766a7f3
--- /dev/null
+++ b/images/icons/message_audio-24px.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Message audio</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Message-audio" stroke="#000000">
+ <path d="M12,2.65 C14.5819312,2.65 16.9194312,3.6965344 18.6114484,5.3885516 C20.3034656,7.08056879 21.35,9.41806879 21.35,12 L21.35,12 L21.35,21.35 L12,21.35 C9.41806879,21.35 7.08056879,20.3034656 5.3885516,18.6114484 C3.6965344,16.9194312 2.65,14.5819312 2.65,12 C2.65,9.41806879 3.6965344,7.08056879 5.3885516,5.3885516 C7.08056879,3.6965344 9.41806879,2.65 12,2.65 L12,2.65 Z" id="Rectangle-Copy-3" stroke-width="1.3"></path>
+ <g id="Group" transform="translate(9.000000, 7.000000)" fill-rule="nonzero">
+ <path d="M3.2826376,0.549537696 C3.71065471,0.549537696 4.09848401,0.72357997 4.37936306,1.00445902 C4.66024211,1.28533807 4.83428439,1.67316737 4.83428439,2.10118448 L4.83428439,2.10118448 L4.83428439,5.11026918 C4.83428439,5.53828591 4.66024191,5.92611527 4.37936272,6.20699446 C4.09848371,6.48787347 3.71065457,6.66191596 3.2826376,6.66191596 C2.8546206,6.66191596 2.46679142,6.48787346 2.18591237,6.20699443 C1.90503317,5.92611525 1.73099067,5.5382859 1.73099067,5.11026918 L1.73099067,5.11026918 L1.73099067,2.10118448 C1.73099067,1.67316738 1.90503297,1.2853381 2.18591204,1.00445905 C2.46679112,0.723579984 2.85462046,0.549537696 3.2826376,0.549537696 Z" id="Path"></path>
+ <path d="M0.277829768,3.46892297 C0.131747046,3.46666758 -0.00228293577,3.60069619 -2.6215198e-05,3.74677891 L-2.6215198e-05,5.1145366 C-2.6215198e-05,6.83681201 1.32262269,8.24623865 3.00908469,8.38435551 L3.00908469,9.35033921 L1.91487307,9.35033921 C1.76379391,9.35033921 1.64132017,9.47280884 1.64132017,9.62389211 C1.64132017,9.77497538 1.76379391,9.89744502 1.91487307,9.89744502 L4.65040212,9.89744502 C4.80148129,9.89744502 4.92395503,9.77497538 4.92395503,9.62389211 C4.92395503,9.47280884 4.80148129,9.35064011 4.65040212,9.35033921 L3.5561905,9.35033921 L3.5561905,8.38435551 C5.24265237,8.24623865 6.56529592,6.83681201 6.56529592,5.1145366 L6.56529592,3.74677891 C6.56731043,3.60225818 6.43625533,3.46933062 6.29171955,3.46933062 C6.14718377,3.46933062 6.01612321,3.60225818 6.01816665,3.74677891 L6.01816665,5.1145366 C6.01816665,6.63475216 4.80285179,7.85006565 3.2826376,7.85006565 C1.76242204,7.85006565 0.547108409,6.63475216 0.547108409,5.1145366 L0.547108409,3.74677891 C0.549351543,3.60354661 0.421062069,3.47118667 0.277829768,3.46892297 Z" id="Path" stroke-width="0.25" fill="#000000"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/message_video-24px.svg b/images/icons/message_video-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2ac611591c3ede6daed81fba8a1ccd009f8bcb5a
--- /dev/null
+++ b/images/icons/message_video-24px.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Message video</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Message-video" stroke="#000000">
+ <path d="M12,2.65 C14.5819312,2.65 16.9194312,3.6965344 18.6114484,5.3885516 C20.3034656,7.08056879 21.35,9.41806879 21.35,12 L21.35,12 L21.35,21.35 L12,21.35 C9.41806879,21.35 7.08056879,20.3034656 5.3885516,18.6114484 C3.6965344,16.9194312 2.65,14.5819312 2.65,12 C2.65,9.41806879 3.6965344,7.08056879 5.3885516,5.3885516 C7.08056879,3.6965344 9.41806879,2.65 12,2.65 L12,2.65 Z" id="Rectangle-Copy-3" stroke-width="1.3"></path>
+ <g id="Ico_Camera" transform="translate(7.000000, 8.000000)">
+ <path d="M6.02370359,0.5 L6.62113006,1.69485294 L8.96139706,1.69485294 L9.29779412,7.28860294 L0.836397059,7.625 L0.5,2.03125 L3.17666405,1.69485294 L3.77409052,0.5 L6.02370359,0.5 Z M5.12098322,2.625 C4.60672884,2.625 4.138625,2.83501324 3.79931912,3.17431912 C3.46001324,3.513625 3.25,3.98172884 3.25,4.49598322 C3.25,5.01019908 3.46001706,5.47829377 3.79933884,5.81759524 C4.13864185,6.15687794 4.60673809,6.36688438 5.12098322,6.36688438 C5.63523282,6.36688438 6.10330461,6.1568772 6.44258599,5.81759581 C6.78188493,5.47829688 6.99188438,5.01020285 6.99188438,4.49598322 C6.99188438,3.98172508 6.78188875,3.51362188 6.44260572,3.17431854 C6.10332147,2.83501398 5.63524207,2.625 5.12098322,2.625 Z" id="Fill-1"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/place_audiocall-24px.svg b/images/icons/place_audiocall-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1bb3ece5daea4a75e66293e587c7a01d57e0826c
--- /dev/null
+++ b/images/icons/place_audiocall-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Phone" stroke="#000000" stroke-width="1.3">
+ <g id="Ico_TEL" transform="translate(3.000000, 3.000000)">
+ <path d="M2.08318114,0.702801822 C3.47221232,-0.375546383 4.67183016,-0.185249641 5.24007015,1.08339531 C6.37655021,3.36695621 7.19734136,4.50873667 6.37655021,5.39678812 C4.86124348,6.41170409 3.78790122,6.91916206 4.35614125,7.99751029 C5.49262131,10.7250969 7.70244359,13.0720901 10.3542304,14.4675995 C11.3644349,15.101922 11.9326749,14.0235738 13.0691549,12.6280643 C14.0162216,11.8668773 15.0895639,12.6914966 17.2993862,14.0235738 C18.4990041,14.7213285 18.5621418,15.8631089 17.4256618,17.1951861 C10.7961949,24.6801913 -5.80904142,6.85572983 2.08318114,0.702801822" id="Path"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/place_videocall-24px.svg b/images/icons/place_videocall-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0c97feca71e8aedab18a72aca627c3eaa12f5149
--- /dev/null
+++ b/images/icons/place_videocall-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Camera" fill-rule="nonzero" stroke="#000000" stroke-width="1.3">
+ <g id="Ico_Camera" transform="translate(2.000000, 6.000000)">
+ <path d="M14.838,0.964 L15.0727616,4.95098691 L18.549033,2.8441558 L19.1831325,10.5544613 L15.0431125,8.28294586 L15.0431125,12.1828061 C15.0222904,12.2250926 14.9986583,12.2532258 14.9607672,12.2532258 L14.9607672,12.2532258 L0.881,12.253 L0.654407741,1.14977472 L14.838,0.964 Z" id="Path"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/plugins-24px.svg b/images/icons/plugins-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6d213d3ae1c3e8bf4175a4b1964d56e4d2f7d989
--- /dev/null
+++ b/images/icons/plugins-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Plugin</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Plugin" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.25">
+ <g id="noun_add-on-plugin_2469914" transform="translate(2.000000, 2.000000)">
+ <path d="M7.95454545,-2.58379177e-14 C6.07714045,-2.58379177e-14 4.54545455,1.53168636 4.54545455,3.40909091 C4.54545455,3.81146364 4.63639864,4.18709545 4.765625,4.54545455 L0.454545455,4.54545455 C0.203517329,4.54547964 -3.28047432e-07,4.74897187 -3.28047432e-07,5 L-3.28047432e-07,9.54545909 C-3.28047432e-07,9.69805849 0.0762260247,9.84056553 0.20341697,9.92488084 C0.330607915,10.0091961 0.49161786,10.0240699 0.632102273,9.96448182 C0.928123182,9.84116364 1.2500475,9.77273182 1.59090909,9.77273182 C2.977005,9.77273182 4.09090909,10.8866409 4.09090909,12.2727318 C4.09090909,13.6588227 2.977005,14.7727318 1.59090909,14.7727318 C1.2500475,14.7727318 0.928123182,14.7043 0.632102273,14.5809591 C0.491614149,14.5213694 0.330599681,14.5362456 0.203407479,14.6205663 C0.0762152768,14.704887 -3.28047432e-07,14.8474011 -3.28047432e-07,15 L-3.28047432e-07,19.5454591 C-3.28047432e-07,19.7964872 0.203517329,20 0.454545455,20 L15.4545455,20 C15.7055736,20 15.9090658,19.7964872 15.9090909,19.5454591 L15.9090909,15.6108 C16.1285164,15.6553682 16.3589991,15.6818227 16.5909091,15.6818227 C18.4683141,15.6818227 19.9999997,14.1501409 19.9999997,12.2727318 C19.9999997,10.3953227 18.4683141,8.86363636 16.5909091,8.86363636 C16.3589991,8.86363636 16.1285164,8.89009545 15.9090909,8.93465909 L15.9090909,5 C15.9090658,4.74897187 15.7055736,4.54547964 15.4545455,4.54545455 L11.1434659,4.54545455 C11.2726923,4.18709545 11.3636364,3.81146364 11.3636364,3.40909091 C11.3636364,1.53168636 9.83195045,-2.58379177e-14 7.95454545,-2.58379177e-14 L7.95454545,-2.58379177e-14 Z M7.95454545,0.909090909 C9.34064136,0.909090909 10.4545455,2.02299545 10.4545455,3.40909091 C10.4545455,3.90517045 10.3070727,4.36090227 10.0568182,4.75142045 C9.96529803,4.89157836 9.95820859,5.07069263 10.0383647,5.21764558 C10.1185209,5.36459852 10.272952,5.45561067 10.4403409,5.45454545 L15,5.45454545 L15,9.54545909 C14.9998246,9.69805849 15.076226,9.84056553 15.203417,9.92488084 C15.3306079,10.0091961 15.4916179,10.0240699 15.6321023,9.96448182 C15.928123,9.84116364 16.2500475,9.77273182 16.5909091,9.77273182 C17.977005,9.77273182 19.0909091,10.8866409 19.0909091,12.2727318 C19.0909091,13.6588227 17.977005,14.7727318 16.5909091,14.7727318 C16.2500475,14.7727318 15.928123,14.7043 15.6321023,14.5809591 C15.4916141,14.5213694 15.3305997,14.5362456 15.2034075,14.6205663 C15.0762153,14.704887 14.999817,14.8474011 15,15.0000045 L15,19.0909136 L0.909090909,19.0909136 L0.909090909,15.6108 C1.12851636,15.6553682 1.35899909,15.6818227 1.59090909,15.6818227 C3.46831409,15.6818227 5,14.1501409 5,12.2727318 C5,10.3953227 3.46831409,8.86363636 1.59090909,8.86363636 C1.35899909,8.86363636 1.12851636,8.89009545 0.909090909,8.93465909 L0.909090909,5.45454545 L5.46875,5.45454545 C5.6361389,5.45561067 5.79057002,5.36459852 5.87072617,5.21764558 C5.95088232,5.07069263 5.94379288,4.89157836 5.85227273,4.75142045 C5.60201818,4.36090227 5.45454545,3.90517045 5.45454545,3.40909091 C5.45454545,2.02299545 6.56844955,0.909090909 7.95454545,0.909090909 L7.95454545,0.909090909 Z" id="Shape"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/quote.svg b/images/icons/quote.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a6b896a3a4704e1cafe304205d5ae82af5f444e3
--- /dev/null
+++ b/images/icons/quote.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="47px" height="30px" viewBox="0 0 47 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>noun_Quote_3101618</title>
+ <g id="CONVERSATION-À-PLUS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.7">
+ <g id="04_JAMI_CONV_Invitation" transform="translate(-702.000000, -310.000000)" fill="#1AB6FF" fill-rule="nonzero">
+ <g id="noun_Quote_3101618" transform="translate(702.000000, 310.000000)">
+ <path d="M9.24003238,27.2740291 C8.58821922,28.5250019 9.49495696,30 10.9415649,30 C11.5043326,30 12.0360615,29.7625927 12.4039467,29.349732 C14.4647143,27.033648 21.2225055,18.9494095 21.9282548,11.8341297 C21.9725231,11.4475374 22,11.0554933 22,10.6570059 C22,10.3333588 21.9811732,10.0458928 21.9542052,9.77527819 C21.4499531,3.84207854 15.9418521,-0.717231757 9.52090737,0.0936206879 C4.60101556,0.715637692 0.635182818,4.63161885 0.0734328381,9.40801556 C-0.615525018,15.279757 3.62660323,20.3376721 9.30414515,21.188175 C10.1823883,21.3210042 10.7538061,22.1482124 10.5085493,22.976412 L9.24003238,27.2740291 Z" id="Path"></path>
+ <path d="M34.2399734,27.2740291 C33.588666,28.5250019 34.4948991,30 35.9415138,30 C36.504284,30 37.0355066,29.7625927 37.4039023,29.349732 C39.4651882,27.033648 46.2225019,18.9494095 46.9287633,11.8341297 C46.972523,11.4475374 47,11.0554933 47,10.6570059 C47,10.3333588 46.9811731,10.0458928 46.954205,9.77527819 C46.4499506,3.84207854 40.9418241,-0.717231757 34.5203408,0.0936206879 C29.6004263,0.715637692 25.6345752,4.63161885 25.0733314,9.40851119 C24.3848792,15.279757 28.6270271,20.3376721 34.3045953,21.188175 C35.1828425,21.3210042 35.7542629,22.1482124 35.509005,22.976412 L34.2399734,27.2740291 Z" id="Path"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/send-24px.svg b/images/icons/send-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c41553c7e8662efc8022904c951e155127e3da91
--- /dev/null
+++ b/images/icons/send-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Send</title>
+ <g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Send" fill-rule="nonzero" stroke="#000000" stroke-width="1.3">
+ <g id="noun_send_3383765" transform="translate(2.000000, 4.000000)">
+ <path d="M0.780292572,1.57323057 L18.9213461,8.16118631 L0.689962339,15.4537398 L1.46479576,9.25507246 L7.92572464,9.25507246 C8.23028166,9.25507246 8.5060063,9.13162634 8.70559168,8.93204096 C8.90517706,8.73245558 9.02862319,8.45673094 9.02862319,8.15217391 C9.02862319,7.84761689 8.90517706,7.57189225 8.70559168,7.37230687 C8.5060063,7.17272149 8.23028166,7.04927536 7.92572464,7.04927536 L7.92572464,7.04927536 L1.46479599,7.04927536 L0.780292572,1.57323057 Z" id="Path"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/send_file-24px.svg b/images/icons/send_file-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2aa34a737dc00879fe5931dd28a2aaea50afb54a
--- /dev/null
+++ b/images/icons/send_file-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Link" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.5">
+ <g id="noun_attach_998912" transform="translate(11.981262, 12.084524) rotate(25.000000) translate(-11.981262, -12.084524) translate(6.981262, 2.084524)">
+ <path d="M4.58333333,20 C2.05607096,20 0,17.943929 0,15.4166667 L0,3.33333333 C0,1.49536133 1.49536133,0 3.33333333,0 C5.17130533,0 6.66666667,1.49536133 6.66666667,3.33333333 L6.66666667,14.1666667 C6.66666667,15.3153483 5.73201496,16.25 4.58333333,16.25 C3.43465171,16.25 2.5,15.3153483 2.5,14.1666667 L2.5,4.56075033 C2.5,4.33064779 2.68636067,4.14408367 2.91666667,4.14408367 C3.14697267,4.14408367 3.33333333,4.33064779 3.33333333,4.56075033 L3.33333333,14.1666667 C3.33333333,14.855957 3.89404296,15.4166667 4.58333333,15.4166667 C5.27262371,15.4166667 5.83333333,14.855957 5.83333333,14.1666667 L5.83333333,3.33333333 C5.83333333,1.95475258 4.71191404,0.833333333 3.33333333,0.833333333 C1.95475262,0.833333333 0.833333333,1.95475263 0.833333333,3.33333333 L0.833333333,15.4166667 C0.833333333,17.4843343 2.51546225,19.1666667 4.58333333,19.1666667 C6.65120442,19.1666667 8.33333333,17.4843343 8.33333333,15.4166667 L8.33333333,4.04276529 C8.33333333,3.81266275 8.519694,3.62609863 8.75,3.62609863 C8.980306,3.62609863 9.16666667,3.81266275 9.16666667,4.04276529 L9.16666667,15.4166667 C9.16666667,17.943929 7.11059571,20 4.58333333,20 Z" id="Path"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/settings-24px.svg b/images/icons/settings-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4bed245a298590f3be31e840bf4ca8bfb84ce301
--- /dev/null
+++ b/images/icons/settings-24px.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Settings" fill="#000000" fill-rule="nonzero">
+ <g id="Shape" transform="translate(2.000000, 2.000000)">
+ <path d="M0.833333333,4.16666667 L3.45208333,4.16666667 C3.82561804,5.63721759 5.14941646,6.66679689 6.66666667,6.66679689 C8.18391688,6.66679689 9.5077153,5.63721759 9.88125,4.16666667 L19.1666667,4.16666667 C19.626904,4.16666667 20,3.79357062 20,3.33333333 C20,2.87309604 19.626904,2.5 19.1666667,2.5 L9.88125,2.5 C9.5077153,1.02944908 8.18391688,-0.000130218715 6.66666667,-0.000130218715 C5.14941646,-0.000130218715 3.82561804,1.02944908 3.45208333,2.5 L0.833333333,2.5 C0.373096042,2.5 0,2.87309604 0,3.33333333 C0,3.79357062 0.373096042,4.16666667 0.833333333,4.16666667 L0.833333333,4.16666667 Z M6.66666667,1.66666667 C7.58714125,1.66666667 8.33333333,2.41285875 8.33333333,3.33333333 C8.33333333,4.25380792 7.58714125,5 6.66666667,5 C5.74619208,5 5,4.25380792 5,3.33333333 C5,2.41285875 5.74619208,1.66666667 6.66666667,1.66666667 Z"></path>
+ <path d="M0.833333333,10.8333333 L10.11875,10.8333333 C10.4922847,12.3038843 11.8160831,13.3334636 13.3333333,13.3334636 C14.8505835,13.3334636 16.174382,12.3038843 16.5479167,10.8333333 L19.1666667,10.8333333 C19.626904,10.8333333 20,10.4602373 20,10 C20,9.53976271 19.626904,9.16666667 19.1666667,9.16666667 L16.5479167,9.16666667 C16.174382,7.69611574 14.8505835,6.66653645 13.3333333,6.66653645 C11.8160831,6.66653645 10.4922847,7.69611574 10.11875,9.16666667 L0.833333333,9.16666667 C0.373096042,9.16666667 0,9.53976271 0,10 C0,10.4602373 0.373096042,10.8333333 0.833333333,10.8333333 L0.833333333,10.8333333 Z M13.3333333,8.33333333 C14.2538079,8.33333333 15,9.07952542 15,10 C15,10.9204746 14.2538079,11.6666667 13.3333333,11.6666667 C12.4128588,11.6666667 11.6666667,10.9204746 11.6666667,10 C11.6666667,9.07952542 12.4128588,8.33333333 13.3333333,8.33333333 Z"></path>
+ <path d="M0.833333333,17.5 L3.45208333,17.5 C3.82561804,18.9705509 5.14941646,20.0001302 6.66666667,20.0001302 C8.18391688,20.0001302 9.5077153,18.9705509 9.88125,17.5 L19.1666667,17.5 C19.626904,17.5 20,17.126904 20,16.6666667 C20,16.2064294 19.626904,15.8333333 19.1666667,15.8333333 L9.88125,15.8333333 C9.5077153,14.3627824 8.18391688,13.3332031 6.66666667,13.3332031 C5.14941646,13.3332031 3.82561804,14.3627824 3.45208333,15.8333333 L0.833333333,15.8333333 C0.373096042,15.8333333 0,16.2064294 0,16.6666667 C0,17.126904 0.373096042,17.5 0.833333333,17.5 Z M6.66666667,15 C7.58714125,15 8.33333333,15.7461921 8.33333333,16.6666667 C8.33333333,17.5871412 7.58714125,18.3333333 6.66666667,18.3333333 C5.74619208,18.3333333 5,17.5871412 5,16.6666667 C5,15.7461921 5.74619208,15 6.66666667,15 Z"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/images/icons/share-24px.svg b/images/icons/share-24px.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4fc06ef2b20e5d2b65e76db056c4be202411d2a3
--- /dev/null
+++ b/images/icons/share-24px.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Moderateur</title>
+ <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Share" fill="#000000" stroke="#000000" stroke-width="0.75">
+ <g id="SHARE" transform="translate(2.000000, 2.000000)">
+ <path d="M13.5,15.00005 C14.6105,15.00005 15.5,15.88955 15.5,17.00005 C15.5,18.1103 14.6105,19.00005 13.5,19.00005 C12.3895,19.00005 11.5,18.1103 11.5,17.00005 C11.5,15.88955 12.3895,15.00005 13.5,15.00005 M3,8.00005 C4.1105,8.00005 5,8.88955 5,10.00005 C5,11.11055 4.1105,12.00005 3,12.00005 C1.8895,12.00005 1,11.11055 1,10.00005 C1,8.88955 1.8895,8.00005 3,8.00005 M13.5,1.00005 C14.6105,1.00005 15.5,1.88955 15.5,3.00005 C15.5,4.11055 14.6105,5.00005 13.5,5.00005 C12.3895,5.00005 11.5,4.11055 11.5,3.00005 C11.5,1.88955 12.3895,1.00005 13.5,1.00005 M13.5,5e-05 C11.849,5e-05 10.5,1.34905 10.5,3.00005 C10.5,3.47555 10.6135,3.92755 10.8125,4.32805 L5.086,7.85155 C4.545,7.3263 3.8095,7.00005 3,7.00005 C1.349,7.00005 0,8.34905 0,10.00005 C0,11.65105 1.349,13.00005 3,13.00005 C3.81525,13.00005 4.552,12.67255 5.09375,12.14055 L10.82025,15.66405 C10.6165,16.0683 10.5,16.51805 10.5,17.00005 C10.5,18.65105 11.849,20.00005 13.5,20.00005 C15.151,20.00005 16.5,18.65105 16.5,17.00005 C16.5,15.34905 15.151,14.00005 13.5,14.00005 C12.6905,14.00005 11.955,14.3263 11.414,14.85155 L5.6875,11.32805 C5.8865,10.92755 6,10.47555 6,10.00005 C6,9.51805 5.8835,9.06855 5.67975,8.66405 L11.40625,5.14055 C11.94825,5.67255 12.68475,6.00005 13.5,6.00005 C15.151,6.00005 16.5,4.65105 16.5,3.00005 C16.5,1.34905 15.151,5e-05 13.5,5e-05" id="Fill-1"></path>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/resources.qrc b/resources.qrc
index 07f0551f8dd5ad5467c97ca3a3bd9bc9ed0f80e7..77b0432c3c5c3fe1b237913555ab91ba85a0ec90 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -129,5 +129,17 @@
<file>images/logo-jami-standard-coul-white.svg</file>
<file>images/icons/moderator.svg</file>
<file>images/icons/star_outline-24px.svg</file>
+ <file>images/icons/send_file-24px.svg</file>
+ <file>images/icons/message_video-24px.svg</file>
+ <file>images/icons/message_audio-24px.svg</file>
+ <file>images/icons/send-24px.svg</file>
+ <file>images/icons/place_videocall-24px.svg</file>
+ <file>images/icons/back-24px.svg</file>
+ <file>images/icons/place_audiocall-24px.svg</file>
+ <file>images/icons/add_people-24px.svg</file>
+ <file>images/icons/share-24px.svg</file>
+ <file>images/icons/settings-24px.svg</file>
+ <file>images/icons/quote.svg</file>
+ <file>images/icons/plugins-24px.svg</file>
</qresource>
</RCC>
diff --git a/src/commoncomponents/AvatarImage.qml b/src/commoncomponents/AvatarImage.qml
index a412cfdc71cffab99d4399b8c5deb37c9bdd1fe7..f9dcf353b472ad8dcc81421716f46b61f98bfc94 100644
--- a/src/commoncomponents/AvatarImage.qml
+++ b/src/commoncomponents/AvatarImage.qml
@@ -213,7 +213,7 @@ Item {
text: unreadMessagesCount > 9 ? "…" : unreadMessagesCount
color: "white"
- font.pointSize: JamiTheme.textFontSize - 2
+ font.pointSize: JamiTheme.indicatorFontSize
}
radius: 30
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 8dd60248dae9f06db3c53539f19fab9b051dfff4..f1b7c5d890e57e81c12e25031c7c89c8fd1f3bb7 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -206,6 +206,13 @@ Item {
property string viewPlugin: qsTr("View plugin")
property string noVideoDevice: qsTr("No video device")
+ // Chatview header
+ property string hideChatView: qsTr("Hide chat view")
+ property string placeAudioCall: qsTr("Place audio call")
+ property string placeVideoCall: qsTr("Place video call")
+ property string showPlugins: qsTr("Show available plugins")
+ property string addToConversations: qsTr("Add to conversations")
+
// ConnectToAccountManager
property string enterJAMSURL: qsTr("Enter Jami Account Management Server (JAMS) URL")
property string required: qsTr("Required")
diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index 1c0863b0c3aa312147e6bb10dd96af56734f383e..363830d12f2ca68e392405c905f1902dbf82dcf7 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -52,9 +52,11 @@ Item {
// Side panel
property color presenceGreen: "#4cd964"
property color notificationRed: "#ff3b30"
+ property color notificationBlue: "#31b7ff"
property color unPresenceOrange: "orange"
property color contactSearchBarPlaceHolderTextFontColor: "#767676"
property color draftRed: "#cf5300"
+ property color selectedTabColor: darkTheme? whiteColor : blackColor
// General buttons
property color pressedButtonColor: darkTheme? pressColor : "#a0a0a0"
@@ -127,12 +129,12 @@ Item {
property color messageInTxtColor: textColor
property color fileOutTimestampColor: darkTheme? "#eee" : "#555"
property color fileInTimestampColor: darkTheme? "#999" : "#555"
- property color chatviewBgColor: darkTheme? "#202020" : "white"
- property color nonActionIconColor: darkTheme? "white" : "#212121"
+ property color chatviewBgColor: darkTheme? "#131313" : "#fafafb"
+ property color bgInvitationRectColor: darkTheme? "#222222" : whiteColor
property color placeholderTextColor: darkTheme? "#2b2b2b" : "#d3d3d3"
property color inviteHoverColor: darkTheme? blackColor : whiteColor
- property color hairlineColor: darkTheme? "262626" : "#d9d9d9"
- property color chatviewButtonColor: darkTheme? "#28b1ed" : "#003b4e"
+ property color chatviewButtonColor: darkTheme? whiteColor : blackColor
+ property color bgTextInput: darkTheme? "#060608" : whiteColor
// Font.
property color faddedFontColor: darkTheme? "#c0c0c0" : "#a0a0a0"
@@ -158,6 +160,7 @@ Item {
// Sizes
property int splitViewHandlePreferredWidth: 4
+ property int indicatorFontSize: 6
property int tinyFontSize: 7
property int textFontSize: 9
property int settingsFontSize: 9
diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml
index 499f0f8597f79653280a06e021baca77071671cc..84c799f48daeb4d7ee1d69e0e993a3f3532269ca 100644
--- a/src/mainview/components/AccountComboBox.qml
+++ b/src/mainview/components/AccountComboBox.qml
@@ -237,7 +237,7 @@ ComboBox {
visible: AccountAdapter.currentAccountType === Profile.Type.RING
toolTipText: JamiStrings.displayQRCode
- source: "qrc:/images/icons/qr_code-24px.svg"
+ source: "qrc:/images/icons/share-24px.svg"
normalColor: JamiTheme.backgroundColor
imageColor: JamiTheme.textColor
@@ -252,7 +252,7 @@ ComboBox {
id: settingsButton
source: !mainView.inSettingsView ?
- "qrc:/images/icons/round-settings-24px.svg" :
+ "qrc:/images/icons/settings-24px.svg" :
"qrc:/images/icons/round-close-24px.svg"
normalColor: JamiTheme.backgroundColor
diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml
index 5eee18ffa500618eae662191ab953ce533f79468..95be7d905c83970c4452e5a11e37ad9150138de9 100644
--- a/src/mainview/components/MessageWebView.qml
+++ b/src/mainview/components/MessageWebView.qml
@@ -89,10 +89,13 @@ Rectangle {
--file-in-timestamp-color:' + JamiTheme.fileOutTimestampColor + ';\
--file-out-timestamp-color:' + JamiTheme.fileInTimestampColor + ';\
--bg-color:' + JamiTheme.chatviewBgColor + ';\
- --non-action-icon-color:' + JamiTheme.nonActionIconColor + ';\
+ --action-icon-color:' + JamiTheme.chatviewButtonColor + ';\
+ --action-icon-hover-color:' + JamiTheme.hoveredButtonColor + ';\
+ --action-icon-press-color:' + JamiTheme.pressedButtonColor + ';\
--placeholder-text-color:' + JamiTheme.placeholderTextColor + ';\
--invite-hover-color:' + JamiTheme.inviteHoverColor + ';\
- --hairline-color:' + JamiTheme.hairlineColor + ';")'
+ --bg-text-input:' + JamiTheme.bgTextInput + ';\
+ --bg-invitation-rect:' + JamiTheme.bgInvitationRectColor + ';")'
messageWebView.runJavaScript("init_picker(" + JamiTheme.darkTheme + ");")
messageWebView.runJavaScript(theme);
}
@@ -199,17 +202,14 @@ Rectangle {
function acceptInvitation() {
MessagesAdapter.acceptInvitation()
- messageWebViewHeader.sendContactRequestButtonVisible = false
}
function refuseInvitation() {
MessagesAdapter.refuseInvitation()
- messageWebViewHeader.sendContactRequestButtonVisible = false
}
function blockConversation() {
MessagesAdapter.blockConversation()
- messageWebViewHeader.sendContactRequestButtonVisible = false
}
function emitMessagesCleared() {
diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml
index d6192c80eddbb51a58f20918e7817ebd10eaf674..26830bad3c312904e96ca0056d16f1cc7c7c0f56 100644
--- a/src/mainview/components/MessageWebViewHeader.qml
+++ b/src/mainview/components/MessageWebViewHeader.qml
@@ -31,7 +31,7 @@ Rectangle {
property string userAliasLabelText
property string userUserNameLabelText
- property string backToWelcomeViewButtonSource: "qrc:/images/icons/ic_arrow_back_24px.svg"
+ property string backToWelcomeViewButtonSource: "qrc:/images/icons/back-24px.svg"
property alias sendContactRequestButtonVisible: sendContactRequestButton.visible
signal backClicked
@@ -39,7 +39,8 @@ Rectangle {
signal pluginSelector
function resetBackToWelcomeViewButtonSource(reset) {
- backToWelcomeViewButtonSource = reset ? "qrc:/images/icons/ic_arrow_back_24px.svg" : "qrc:/images/icons/round-close-24px.svg"
+ backToWelcomeViewButtonSource = reset ? "qrc:/images/icons/back-24px.svg"
+ : "qrc:/images/icons/round-close-24px.svg"
}
function toggleMessagingHeaderButtonsVisible(visible) {
@@ -47,7 +48,7 @@ Rectangle {
startAVideoCallButton.visible = visible
}
- color: JamiTheme.secondaryBackgroundColor
+ color: JamiTheme.chatviewBgColor
RowLayout {
id: messagingHeaderRectRowLayout
@@ -58,15 +59,18 @@ Rectangle {
id: backToWelcomeViewButton
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
- Layout.leftMargin: 16
+ Layout.leftMargin: 8
+
+ preferredSize: 24
source: backToWelcomeViewButtonSource
+ toolTipText: JamiStrings.hideChatView
- normalColor: JamiTheme.secondaryBackgroundColor
+ normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
- if (backToWelcomeViewButtonSource === "qrc:/images/icons/ic_arrow_back_24px.svg")
+ if (backToWelcomeViewButtonSource === "qrc:/images/icons/back-24px.svg")
messagingHeaderRect.backClicked()
else
messagingHeaderRect.needToHideConversationInCall()
@@ -84,7 +88,7 @@ Rectangle {
Layout.fillHeight: true
Layout.topMargin: 7
Layout.bottomMargin: 7
- Layout.leftMargin: 16
+ Layout.leftMargin: 8
color: JamiTheme.transparentColor
@@ -132,7 +136,7 @@ Rectangle {
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.preferredWidth: childrenRect.width + 18
Layout.preferredHeight: childrenRect.height
- Layout.rightMargin: 16
+ Layout.rightMargin: 8
color: "transparent"
@@ -140,12 +144,13 @@ Rectangle {
id: startAAudioCallButton
anchors.right: startAVideoCallButton.left
- anchors.rightMargin: 16
+ anchors.rightMargin: 8
anchors.verticalCenter: buttonGroup.verticalCenter
- source: "qrc:/images/icons/ic_phone_24px.svg"
+ source: "qrc:/images/icons/place_audiocall-24px.svg"
+ toolTipText: JamiStrings.placeAudioCall
- normalColor: JamiTheme.secondaryBackgroundColor
+ normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
@@ -162,12 +167,13 @@ Rectangle {
sendContactRequestButton.visible ?
sendContactRequestButton.left :
buttonGroup.right
- anchors.rightMargin: 16
+ anchors.rightMargin: 8
anchors.verticalCenter: buttonGroup.verticalCenter
- source: "qrc:/images/icons/videocam-24px.svg"
+ source: "qrc:/images/icons/place_videocall-24px.svg"
+ toolTipText: JamiStrings.placeVideoCall
- normalColor: JamiTheme.secondaryBackgroundColor
+ normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
@@ -192,12 +198,13 @@ Rectangle {
anchors.right: sendContactRequestButton.visible ?
sendContactRequestButton.left :
buttonGroup.right
- anchors.rightMargin: 16
+ anchors.rightMargin: sendContactRequestButton.visible ? 8 : 16
anchors.verticalCenter: buttonGroup.verticalCenter
- source: "qrc:/images/icons/extension_24dp.svg"
+ source: "qrc:/images/icons/plugins-24px.svg"
+ toolTipText: JamiStrings.showPlugins
- normalColor: JamiTheme.secondaryBackgroundColor
+ normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: pluginSelector()
@@ -210,10 +217,10 @@ Rectangle {
anchors.rightMargin: 8
anchors.verticalCenter: buttonGroup.verticalCenter
- width: sendContactRequestButton.visible ? preferredSize : 0
- source: "qrc:/images/icons/person_add-24px.svg"
+ source: "qrc:/images/icons/add_people-24px.svg"
+ toolTipText: JamiStrings.addToConversations
- normalColor: JamiTheme.secondaryBackgroundColor
+ normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index 9686a761df9b3916c5baf243ddde53a2284ba245..5baf1968e3341fd385a9133d742479ad2dfa5c33 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -112,7 +112,7 @@ Rectangle {
anchors.top: contactSearchBar.bottom
anchors.topMargin: 10
width: sidePanelRect.width
- height: tabBarVisible ? 64 : 0
+ height: tabBarVisible ? 48 : 0
}
Rectangle {
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index 980efbf61ab2aa2aa8e8efe2eebe09a559aee925..6cfd0248f8a85e9ce680f246715066976004786a 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -68,31 +68,6 @@ TabBar {
id: pageOne
down: true
- Rectangle {
- id: totalUnreadMessagesCountRect
-
- anchors.centerIn: buttonRectOne
- anchors.verticalCenterOffset : -20
- anchors.horizontalCenterOffset : 15
-
- width: 16
- height: 16
-
- visible: totalUnreadMessagesCount > 0
-
- Text {
- id: totalUnreadMessagesCountText
-
- anchors.centerIn: totalUnreadMessagesCountRect
-
- text: totalUnreadMessagesCount > 9 ? "···" : totalUnreadMessagesCount
- color: "white"
- font.pointSize: JamiTheme.textFontSize
- }
- radius: 30
- color: JamiTheme.notificationRed
-
- }
background: Rectangle {
@@ -101,29 +76,6 @@ TabBar {
height: tabBar.height
color: JamiTheme.backgroundColor
- Image {
- id: imgRectOne
- anchors.horizontalCenter: buttonRectOne.horizontalCenter
- anchors.top: buttonRectOne.top
- anchors.topMargin: 12
-
- width: 24
- height: 24
-
- fillMode: Image.PreserveAspectFit
- mipmap: true
- source: "qrc:/images/icons/baseline-people-24px.svg"
- //opacity: enabled ? 0.8 : 0.3
- opacity: pageOne.down == true ? 1.0 : opacityDegree
- }
-
- ColorOverlay {
- anchors.fill: imgRectOne
- source: imgRectOne
- color: JamiTheme.blueLogo_
- opacity: pageOne.down == true ? 1.0 : opacityDegree
- }
-
Text {
id: textConvElement
@@ -137,7 +89,33 @@ TabBar {
text: JamiStrings.conversations
font.pointSize: JamiTheme.textFontSize
opacity: pageOne.down == true ? 1.0 : opacityDegree
- color: JamiTheme.blueLogo_
+ color: JamiTheme.textColor
+ }
+
+ Rectangle {
+ id: totalUnreadMessagesCountRect
+
+ anchors.left: textConvElement.right
+ anchors.leftMargin: 4
+ anchors.verticalCenter: textConvElement.verticalCenter
+ anchors.verticalCenterOffset : -5
+
+ width: 12
+ height: 12
+
+ visible: totalUnreadMessagesCount > 0
+
+ Text {
+ id: totalUnreadMessagesCountText
+
+ anchors.centerIn: totalUnreadMessagesCountRect
+
+ text: totalUnreadMessagesCount > 9 ? "···" : totalUnreadMessagesCount
+ color: "white"
+ font.pointSize: JamiTheme.indicatorFontSize
+ }
+ radius: 30
+ color: JamiTheme.notificationBlue
}
Rectangle {
@@ -145,7 +123,7 @@ TabBar {
width: buttonRectOne.width
anchors.bottom: buttonRectOne.bottom
height: 2
- color: pageOne.down == true ? JamiTheme.blueLogo_ : "transparent"
+ color: pageOne.down == true ? JamiTheme.textColor : "transparent"
}
MouseArea {
@@ -180,31 +158,6 @@ TabBar {
id: pageTwo
- Rectangle {
- id: pendingRequestCountRect
-
- anchors.centerIn: buttonRectTwo
- anchors.verticalCenterOffset : -20
- anchors.horizontalCenterOffset : 15
-
- width: 16
- height: 16
-
- visible: pendingRequestCount > 0
-
- Text {
- id: pendingRequestCountText
-
- anchors.centerIn: pendingRequestCountRect
-
- text: pendingRequestCount > 9 ? "···" : pendingRequestCount
- color: JamiTheme.backgroundColor
- font.pointSize: JamiTheme.textFontSize
- }
- radius: 30
- color: JamiTheme.notificationRed
- }
-
background: Rectangle {
id: buttonRectTwo
@@ -212,29 +165,6 @@ TabBar {
height: tabBar.height
color: JamiTheme.backgroundColor
- Image {
- id: imgRectTwo
- anchors.horizontalCenter: buttonRectTwo.horizontalCenter
- anchors.top: buttonRectTwo.top
- anchors.topMargin: 10
-
- width: 24
- height: 24
-
- fillMode: Image.PreserveAspectFit
- mipmap: true
- source: "qrc:/images/icons/drafts-24px.svg"
- //opacity: enabled ? 0.8 : 0.3
- opacity: pageTwo.down == true ? 1.0 : opacityDegree
- }
-
- ColorOverlay {
- anchors.fill: imgRectTwo
- source: imgRectTwo
- color: JamiTheme.blueLogo_
- opacity: pageTwo.down == true ? 1.0 : opacityDegree
- }
-
Text {
id: textInvElement
@@ -250,7 +180,33 @@ TabBar {
text: JamiStrings.invitations
//opacity: enabled ? 1.0 : 0.3
opacity: pageTwo.down == true ? 1.0 : opacityDegree
- color: JamiTheme.blueLogo_
+ color: JamiTheme.textColor
+ }
+
+ Rectangle {
+ id: pendingRequestCountRect
+
+ anchors.left: textInvElement.right
+ anchors.leftMargin: 4
+ anchors.verticalCenter: textInvElement.verticalCenter
+ anchors.verticalCenterOffset : -5
+
+ width: 12
+ height: 12
+
+ visible: pendingRequestCount > 0
+
+ Text {
+ id: pendingRequestCountText
+
+ anchors.centerIn: pendingRequestCountRect
+
+ text: pendingRequestCount > 9 ? "···" : pendingRequestCount
+ color: "white"
+ font.pointSize: JamiTheme.indicatorFontSize
+ }
+ radius: 30
+ color: JamiTheme.notificationBlue
}
Rectangle {
@@ -258,7 +214,7 @@ TabBar {
width: buttonRectTwo.width
anchors.bottom: buttonRectTwo.bottom
height: 2
- color: pageTwo.down == true ? JamiTheme.blueLogo_ : "transparent"
+ color: pageTwo.down == true ? JamiTheme.textColor : "transparent"
}
MouseArea {
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 3efffb90320f7b3ab8d09a86f341fe4070f848a8..829b89a644454f7025075c27af67430f1deada1f 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -82,20 +82,15 @@ MessagesAdapter::setupChatView(const QString& convUid)
} catch (...) {
}
- bool shouldShowSendContactRequestBtn = (contactInfo.profileInfo.type
- == lrc::api::profile::Type::PENDING
- || contactInfo.profileInfo.type
- == lrc::api::profile::Type::TEMPORARY);
+ bool isPending = contactInfo.profileInfo.type == profile::Type::TEMPORARY;
QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible",
- Q_ARG(QVariant, shouldShowSendContactRequestBtn));
+ Q_ARG(QVariant, isPending));
setMessagesVisibility(false);
- /*
- * Type Indicator (contact).
- */
+ // Type Indicator (contact). TODO: Not shown when invitation request?
contactIsComposing(convInfo.uid, "", false);
connect(lrcInstance_->getCurrentConversationModel(),
&ConversationModel::composingStatusChanged,
@@ -106,9 +101,7 @@ MessagesAdapter::setupChatView(const QString& convUid)
contactIsComposing(convUid, contactUri, isComposing);
});
- /*
- * Draft and message content set up.
- */
+ // Draft and message content set up.
Utils::oneShotConnect(qmlObj_,
SIGNAL(sendMessageContentSaved(const QString&)),
this,
diff --git a/src/messagesadapter.h b/src/messagesadapter.h
index 2757151e8fe2b104b8c4d2303ec69ec70c4e2fc9..8fdcbf8599ce477b23224577c7c335a2ca4f18c0 100644
--- a/src/messagesadapter.h
+++ b/src/messagesadapter.h
@@ -74,7 +74,7 @@ protected:
// Run corrsponding js functions, c++ to qml.
void setMessagesVisibility(bool visible);
void requestSendMessageContent();
- void setInvitation(bool show, const QString& contactUri = "", const QString& contactId = "");
+ void setInvitation(bool show, const QString& contactUri = {}, const QString& contactId = {});
void clear();
void printHistory(lrc::api::ConversationModel& conversationModel,
const std::map<uint64_t, lrc::api::interaction::Info> interactions);
@@ -89,7 +89,7 @@ protected:
void setMessagesFileContent(const QString& path);
void removeInteraction(uint64_t interactionId);
void setSendMessageContent(const QString& content);
- void contactIsComposing(const QString& uid, const QString& contactUri, bool isComposing);
+ void contactIsComposing(const QString& convUid, const QString& contactUri, bool isComposing);
Q_SIGNALS:
void needToUpdateSmartList();