From 5df934d452aaedf319028740987de0e0dcac52d5 Mon Sep 17 00:00:00 2001
From: TheJackiMonster <thejackimonster@gmail.com>
Date: Wed, 24 Nov 2021 03:18:23 +0100
Subject: Added invitations for private chats and cleaned up status messages

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 resources/css/style.css        |   2 +-
 resources/ui/message-sent.ui   |   3 -
 resources/ui/message-status.ui | 140 ++++++++++++++++++++++++++++++++++++++---
 resources/ui/message.ui        |   3 -
 4 files changed, 131 insertions(+), 17 deletions(-)

(limited to 'resources')

diff --git a/resources/css/style.css b/resources/css/style.css
index 743e0c1..a75a5e2 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -58,7 +58,7 @@
 }
 
 .message-box.status > .message-content {
-	padding: 2px 12px;
+	padding: 2px 4px;
 }
 
 .settings-entry {
diff --git a/resources/ui/message-sent.ui b/resources/ui/message-sent.ui
index 6fd9e04..25ac52c 100644
--- a/resources/ui/message-sent.ui
+++ b/resources/ui/message-sent.ui
@@ -59,7 +59,6 @@ Author: Tobias Frisch
               <object class="GtkLabel" id="text_label">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
                 <property name="wrap">True</property>
                 <property name="max-width-chars">64</property>
                 <property name="xalign">0</property>
@@ -92,7 +91,6 @@ Author: Tobias Frisch
                   <object class="GtkLabel" id="timestamp_label">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">0min</property>
                     <attributes>
                       <attribute name="weight" value="light"/>
                     </attributes>
@@ -120,7 +118,6 @@ Author: Tobias Frisch
           <object class="GtkLabel" id="sender_label">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">User</property>
             <attributes>
               <attribute name="weight" value="semibold"/>
             </attributes>
diff --git a/resources/ui/message-status.ui b/resources/ui/message-status.ui
index 54d0d0b..7d5b233 100644
--- a/resources/ui/message-status.ui
+++ b/resources/ui/message-status.ui
@@ -22,7 +22,8 @@ Author: Tobias Frisch
 -->
 <interface>
   <requires lib="gtk+" version="3.24"/>
-  <object class="GtkBox">
+  <requires lib="libhandy" version="1.2"/>
+  <object class="GtkBox" id="message_box">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
@@ -36,17 +37,113 @@ Author: Tobias Frisch
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="spacing">8</property>
             <child>
-              <object class="GtkLabel" id="status_label">
+              <object class="GtkButton" id="deny_button">
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="relief">none</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">edit-delete-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">status information</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="text_label">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">invited you to a chat</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                    <property name="xalign">0.5</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="spacing">4</property>
+                    <child>
+                      <object class="GtkImage" id="read_receipt_image">
+                        <property name="can-focus">False</property>
+                        <property name="xalign">1</property>
+                        <property name="icon-name">emblem-default-symbolic</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="timestamp_label">
+                        <property name="can-focus">False</property>
+                        <property name="justify">right</property>
+                        <property name="xalign">1</property>
+                        <attributes>
+                          <attribute name="weight" value="light"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack-type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="accept_button">
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="relief">none</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">emblem-ok-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="pack-type">end</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <style>
@@ -55,13 +152,36 @@ Author: Tobias Frisch
           </object>
         </child>
         <child type="label">
-          <object class="GtkLabel" id="sender_label">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">User</property>
-            <attributes>
-              <attribute name="weight" value="semibold"/>
-            </attributes>
+            <property name="spacing">4</property>
+            <child>
+              <object class="HdyAvatar" id="sender_avatar">
+                <property name="can-focus">False</property>
+                <property name="size">24</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="sender_label">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="xalign">0</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
         </child>
         <style>
diff --git a/resources/ui/message.ui b/resources/ui/message.ui
index ceb84f4..42bde4d 100644
--- a/resources/ui/message.ui
+++ b/resources/ui/message.ui
@@ -58,7 +58,6 @@ Author: Tobias Frisch
               <object class="GtkLabel" id="text_label">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
                 <property name="wrap">True</property>
                 <property name="max-width-chars">64</property>
                 <property name="xalign">0</property>
@@ -90,7 +89,6 @@ Author: Tobias Frisch
                   <object class="GtkLabel" id="timestamp_label">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">0min</property>
                     <attributes>
                       <attribute name="weight" value="light"/>
                     </attributes>
@@ -118,7 +116,6 @@ Author: Tobias Frisch
           <object class="GtkLabel" id="sender_label">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">User</property>
             <attributes>
               <attribute name="weight" value="semibold"/>
             </attributes>
-- 
cgit v1.2.3