From a5c5038981f43894556cdb8aaa99c23025635178 Mon Sep 17 00:00:00 2001
From: Infi <wingit@geist.ga>
Date: Wed, 23 Mar 2022 23:42:07 +0100
Subject: [PATCH 1/2] feat: merge demo mockup UI

Co-authored-by: LolzDEV <LolzDEV@users.noreply.github.com>
---
 .gitignore                  |   1 +
 data/resources/ui/window.ui | 112 ++++++++++++++++++++++++++++++------
 src/window.rs               |   6 +-
 3 files changed, 100 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a3a73a..a06cb20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ vendor
 flatpak_app/
 .flatpak-builder/
 recompile/
+.vscode
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 239a221..bf9eba6 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -17,32 +17,112 @@
     </section>
   </menu>
   <template class="MutinyAppWindow" parent="AdwApplicationWindow">
-    <property name="content">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
+    <property name="default-width">980</property>
+    <property name="default-height">640</property>
+
+    <child>
+      <object class="AdwLeaflet" id="main_leaflet">
+        <property name="hexpand">True</property>
+
         <child>
-          <object class="AdwHeaderBar" id="headerbar">
-            <property name="title-widget">
-              <object class="AdwWindowTitle">
-                <property name="title" translatable="yes">Mutiny</property>
+          <object class="GtkBox" id="sidebar_box">
+            <property name="hexpand">False</property>
+            <property name="orientation">vertical</property>
+
+            <child>
+              <object class="AdwHeaderBar" id="header">
+                <property name="show-start-title-buttons">True</property>
+                <property name="show-end-title-buttons" bind-source="main_leaflet" bind-property="folded" bind-flags="sync-create"/>
+                <property name="title-widget">
+                  <object class="GtkBox" id="title_box">
+                    <property name="orientation">horizontal</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="AdwWindowTitle" id="sidebar_title_widget">
+                        <property name="title" translatable="yes">Mutiny</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="sidebar_title_button">
+                        <!-- Placeholder -->
+                        <property name="icon-name">emoji-food-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
               </object>
-            </property>
-            <child type="end">
-              <object class="GtkMenuButton" id="appmenu_button">
-                <property name="icon-name">open-menu-symbolic</property>
-                <property name="menu-model">primary_menu</property>
+            </child>
+
+            <child>
+              <object class="GtkListBox">
+                <child>
+                  <object class="GtkListBoxRow">
+                    <child>
+                      <object class="GtkBox">
+                        <property name="margin-start">24</property>
+                        <property name="margin-end">24</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="AdwAvatar">
+                            <property name="text">among us</property>
+                            <property name="size">24</property>
+                            <property name="show-initials">true</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Among Us</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="icon_name">go-next-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
         </child>
+
         <child>
-          <object class="GtkLabel" id="label">
-            <property name="label" translatable="yes">Hello world!</property>
+          <object class="AdwLeafletPage">
+            <property name="navigatable">False</property>
+            <property name="child">
+              <object class="GtkSeparator" id="panel_separator">
+                <property name="orientation">vertical</property>
+                <style>
+                  <class name="sidebar"/>
+                </style>
+              </object>
+            </property>
+
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkBox">
             <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="AdwHeaderBar">
+                <property name="title-widget">
+                  <object class="AdwWindowTitle">
+                    <property name="title" translatable="yes">Test server</property>
+                  </object>
+                </property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
-    </property>
+    </child>
   </template>
 </interface>
diff --git a/src/window.rs b/src/window.rs
index 1117457..1fce7d8 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -14,15 +14,15 @@ mod imp {
     #[derive(Debug, CompositeTemplate)]
     #[template(resource = "/chat/revolt/Mutiny/ui/window.ui")]
     pub struct MutinyAppWindow {
-        #[template_child]
-        pub headerbar: TemplateChild<adw::HeaderBar>,
+        // #[template_child]
+        // pub headerbar: TemplateChild<adw::HeaderBar>,
         pub settings: gio::Settings,
     }
 
     impl Default for MutinyAppWindow {
         fn default() -> Self {
             Self {
-                headerbar: TemplateChild::default(),
+                // headerbar: TemplateChild::default(),
                 settings: gio::Settings::new(APP_ID),
             }
         }

From 345b1471251dae82bb5ac616fad2e9847a14ee36 Mon Sep 17 00:00:00 2001
From: Lorenzo Torres <52113626+LolzDEV@users.noreply.github.com>
Date: Wed, 23 Mar 2022 23:43:39 +0100
Subject: [PATCH 2/2] chore: stabilize flatpak runtime version

---
 build-aux/chat.revolt.Mutiny.Devel.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/chat.revolt.Mutiny.Devel.json b/build-aux/chat.revolt.Mutiny.Devel.json
index 376b120..b02e963 100644
--- a/build-aux/chat.revolt.Mutiny.Devel.json
+++ b/build-aux/chat.revolt.Mutiny.Devel.json
@@ -1,7 +1,7 @@
 {
     "app-id": "chat.revolt.Mutiny.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "42",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"