Rework encryption enabling logic + UI

2 files changed, 70 insertions, 3 deletions

diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index f639776e..e47dd4ba 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -3,15 +3,15 @@
     <requires lib="gtk+" version="3.22"/>
     <template class="DinoUiChatInputView">
         <property name="hexpand">True</property>
-        <property name="orientation">horizontal</property>
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <style>
             <class name="dino-chatinput"/>
         </style>
         <child>
             <object class="GtkFrame" id="frame">
-                <property name="margin">12</property>
-                <property name="margin_top">0</property>
+                <property name="margin_start">14</property>
+                <property name="margin_end">14</property>
                 <property name="visible">True</property>
                 <child>
                     <object class="GtkBox" id="outer_box">
@@ -65,5 +65,20 @@
                 </child>
             </object>
         </child>
+        <child>
+            <object class="GtkLabel" id="chat_input_status">
+                <property name="xalign">0</property>
+                <property name="margin_bottom">3</property>
+                <property name="margin_start">14</property>
+                <property name="margin_end">14</property>
+                <property name="visible">True</property>
+                <attributes>
+                    <attribute name="scale" value="0.8"/>
+                </attributes>
+                <style>
+                    <class name="chat-input-status"/>
+                </style>
+            </object>
+        </child>
     </template>
 </interface>
diff --git a/main/data/theme.css b/main/data/theme.css
index d1e41d5b..9fc08db8 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -77,6 +77,10 @@ window.dino-main .dino-chatinput frame box {
     background: transparent;
 }
 
+window.dino-main button.dino-attach-button {
+    min-width: 24px; /* Make button the same with as avatars */
+}
+
 window.dino-main button.dino-chatinput-button {
     border: none;
     background: transparent;
@@ -103,3 +107,51 @@ window.dino-main button.dino-chatinput-button:checked {
 window.dino-main button.dino-chatinput-button:checked:backdrop {
     color: alpha(@theme_unfocused_selected_bg_color, 0.8);
 }
+
+
+.dino-chatinput textview, .dino-chatinput textview text {
+    background-color: transparent;
+}
+
+/*Chat input warning*/
+
+box.dino-input-warning frame border {
+    border-color: @warning_color;
+}
+
+box.dino-input-warning frame separator {
+    background-color: @warning_color;
+    border: none;
+}
+
+box.dino-input-warning label {
+    color: mix(@warning_color, @theme_fg_color, 0.5);
+}
+
+/*Chat input error*/
+
+box.dino-input-error frame border {
+    border-color: @error_color;
+}
+
+box.dino-input-error frame separator {
+    background-color: @error_color;
+    border: none;
+}
+
+box.dino-input-error label {
+    color: @error_color;
+}
+
+@keyframes input-error-highlight {
+    0% { color: mix(@error_color, @theme_fg_color, 0.3);}
+    30% { color: @error_color; text-shadow: 0px 0px 2px alpha(@error_color, 0.4); }
+    100% { color: mix(@error_color, @theme_fg_color, 0.3); }
+}
+
+box.dino-input-error label.input-status-highlight-once {
+    animation-duration: 1s;
+    animation-timing-function: linear;
+    animation-iteration-count: 1;
+    animation-name: input-error-highlight;
+}