From 3f9318f83f75ee45ede07da4e617556421505eeb Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Sun, 5 Oct 2025 11:20:39 +0200
Subject: Use AdwNavigationSplitView instead of AdwLeaflet for main window

---
 main/data/chat_input.ui                 |   6 +-
 main/data/conversation_list_titlebar.ui |  33 ------
 main/data/conversation_row.ui           |   4 +-
 main/data/gresource.xml                 |   5 +-
 main/data/main_window.ui                | 188 ++++++++++++++++++++++++++++++++
 main/data/main_window_placeholder.ui    |  51 +++++++++
 main/data/style.css                     |  14 ---
 main/data/unified_main_content.ui       | 126 ---------------------
 main/data/unified_window_placeholder.ui |  51 ---------
 9 files changed, 246 insertions(+), 232 deletions(-)
 delete mode 100644 main/data/conversation_list_titlebar.ui
 create mode 100644 main/data/main_window.ui
 create mode 100644 main/data/main_window_placeholder.ui
 delete mode 100644 main/data/unified_main_content.ui
 delete mode 100644 main/data/unified_window_placeholder.ui

(limited to 'main/data')

diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index cde00b22..7164f733 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -4,15 +4,15 @@
     <template class="DinoUiChatInputView">
         <property name="hexpand">True</property>
         <property name="orientation">vertical</property>
-        <style>
-            <class name="dino-chatinput"/>
-        </style>
         <child>
             <object class="GtkFrame" id="frame">
                 <property name="margin_start">14</property>
                 <property name="margin_end">14</property>
                 <property name="child">
                     <object class="GtkBox" id="outer_box">
+                        <style>
+                            <class name="dino-chatinput"/>
+                        </style>
                         <child>
                             <object class="GtkButton" id="file_button">
                                 <property name="icon-name">mail-attachment-symbolic</property>
diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui
deleted file mode 100644
index afe10926..00000000
--- a/main/data/conversation_list_titlebar.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <requires lib="gtk" version="4.0"/>
-    <requires lib="adw" version="1.0"/>
-    <object class="AdwHeaderBar" id="header_bar">
-        <property name="hexpand">False</property>
-        <style>
-            <class name="dino-left"/>
-        </style>
-        <child>
-            <object class="GtkMenuButton" id="add_button">
-                <property name="has-frame">False</property>
-                <child>
-                    <object class="GtkImage">
-                        <property name="icon-name">list-add-symbolic</property>
-                        <property name="icon-size">normal</property>
-                    </object>
-                </child>
-            </object>
-        </child>
-        <child type="end">
-            <object class="GtkMenuButton" id="menu_button">
-                <property name="has-frame">False</property>
-                <child>
-                    <object class="GtkImage">
-                        <property name="icon-name">open-menu-symbolic</property>
-                        <property name="icon-size">normal</property>
-                    </object>
-                </child>
-            </object>
-        </child>
-    </object>
-</interface>
diff --git a/main/data/conversation_row.ui b/main/data/conversation_row.ui
index c59ab8e0..1cd499a2 100644
--- a/main/data/conversation_row.ui
+++ b/main/data/conversation_row.ui
@@ -11,8 +11,8 @@
                         <property name="orientation">horizontal</property>
                         <property name="margin-top">10</property>
                         <property name="margin-bottom">10</property>
-                        <property name="margin-start">7</property>
-                        <property name="margin-end">14</property>
+                        <property name="margin-start">2</property>
+                        <property name="margin-end">4</property>
                         <child>
                             <object class="DinoUiAvatarPicture" id="picture">
                                 <property name="height-request">35</property>
diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 5b9b0211..e39295c4 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -14,7 +14,6 @@
     <file>conversation_details.css</file>
     <file>conversation_details.ui</file>
     <file>conversation_item_widget.ui</file>
-    <file>conversation_list_titlebar.ui</file>
     <file>conversation_row.ui</file>
     <file>conversation_view.ui</file>
     <file>dino-conversation-list-placeholder-arrow.svg</file>
@@ -66,6 +65,8 @@
     <file>join_room_dialog.ui</file>
     <file>join_room_dialog1.ui</file>
     <file>join_room_dialog2.ui</file>
+    <file>main_window.ui</file>
+    <file>main_window_placeholder.ui</file>
     <file>menu_add.ui</file>
     <file>menu_app.ui</file>
     <file>menu_conversation.ui</file>
@@ -78,7 +79,5 @@
     <file>search_autocomplete.ui</file>
     <file>style-dark.css</file>
     <file>style.css</file>
-    <file>unified_main_content.ui</file>
-    <file>unified_window_placeholder.ui</file>
   </gresource>
 </gresources>
diff --git a/main/data/main_window.ui b/main/data/main_window.ui
new file mode 100644
index 00000000..df755d17
--- /dev/null
+++ b/main/data/main_window.ui
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <requires lib="gtk" version="4.0"/>
+    <requires lib="libadwaita" version="1.4"/>
+    <template class="DinoUiMainWindow" parent="AdwApplicationWindow">
+        <child>
+            <object class="AdwBreakpoint">
+                <condition>max-width: 600sp</condition>
+                <setter object="navigation_split_view" property="collapsed">True</setter>
+            </object>
+        </child>
+        <property name="content">
+            <object class="GtkStack" id="stack">
+                <child>
+                    <object class="GtkStackPage">
+                        <property name="name">main</property>
+                        <property name="child">
+                            <object class="AdwNavigationSplitView" id="navigation_split_view">
+                                <property name="vexpand">True</property>
+                                <property name="sidebar">
+                                    <object class="AdwNavigationPage">
+                                        <property name="title">Dino</property>
+                                        <property name="tag">sidebar</property>
+                                        <property name="child">
+                                            <object class="AdwToolbarView">
+                                                <child type="top">
+                                                    <object class="AdwHeaderBar" id="header_bar">
+                                                        <property name="show-title">False</property>
+                                                        <property name="hexpand">False</property>
+                                                        <style>
+                                                            <class name="dino-left"/>
+                                                        </style>
+                                                        <child>
+                                                            <object class="GtkMenuButton" id="add_button">
+                                                                <property name="has-frame">False</property>
+                                                                <child>
+                                                                    <object class="GtkImage">
+                                                                        <property name="icon-name">list-add-symbolic</property>
+                                                                        <property name="icon-size">normal</property>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                        <child type="end">
+                                                            <object class="GtkMenuButton" id="menu_button">
+                                                                <property name="has-frame">False</property>
+                                                                <child>
+                                                                    <object class="GtkImage">
+                                                                        <property name="icon-name">open-menu-symbolic</property>
+                                                                        <property name="icon-size">normal</property>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </child>
+                                                <property name="content">
+                                                    <object class="GtkStack" id="left_stack">
+                                                        <property name="hexpand">False</property>
+                                                        <child>
+                                                            <object class="GtkStackPage">
+                                                                <property name="name">content</property>
+                                                                <property name="child">
+                                                                    <object class="GtkScrolledWindow">
+                                                                        <property name="hscrollbar_policy">never</property>
+                                                                        <property name="vexpand">1</property>
+                                                                        <child>
+                                                                            <object class="DinoUiConversationSelector" id="conversation_selector">
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </property>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkStackPage">
+                                                                <property name="name">placeholder</property>
+                                                                <property name="child">
+                                                                    <object class="AdwStatusPage">
+                                                                        <style>
+                                                                            <class name="compact"/>
+                                                                        </style>
+                                                                        <property name="margin-start">20</property>
+                                                                        <property name="margin-end">20</property>
+                                                                        <property name="margin-top">20</property>
+                                                                        <property name="margin-bottom">20</property>
+                                                                        <property name="width_request">260</property>
+
+                                                                        <property name="title" translatable="yes">You have no open chats</property>
+                                                                        <property name="description" translatable="yes">Click + to start a chat or join a channel</property>
+                                                                    </object>
+                                                                </property>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </property>
+                                            </object>
+                                        </property>
+                                    </object>
+                                </property>
+                                <property name="content">
+                                    <object class="AdwNavigationPage">
+                                        <property name="title">Conversation</property>
+                                        <property name="child">
+                                            <object class="AdwToolbarView">
+                                                <child type="top">
+                                                    <object class="AdwHeaderBar" id="conversation_headerbar">
+                                                        <property name="title-widget">
+                                                            <object class="AdwWindowTitle" id="conversation_window_title" />
+                                                        </property>
+                                                    </object>
+                                                </child>
+                                                <property name="content">
+                                                    <object class="AdwFlap" id="search_flap">
+                                                        <property name="flap-position">end</property>
+                                                        <property name="modal">true</property>
+                                                        <property name="locked">true</property>
+                                                        <property name="swipe-to-open">false</property>
+                                                        <property name="fold-threshold-policy">natural</property>
+                                                        <property name="hexpand">true</property>
+                                                        <child type="content">
+                                                            <object class="DinoUiNaturalSizeIncrease">
+                                                                <property name="min-natural-width">600</property>
+                                                                <child>
+                                                                    <object class="GtkStack" id="right_stack">
+                                                                        <property name="hexpand">false</property>
+                                                                        <child>
+                                                                            <object class="GtkStackPage">
+                                                                                <property name="name">content</property>
+                                                                                <property name="child">
+                                                                                    <object class="DinoUiConversationView" id="conversation_view">
+                                                                                    </object>
+                                                                                </property>
+                                                                            </object>
+                                                                        </child>
+                                                                        <child>
+                                                                            <object class="GtkStackPage">
+                                                                                <property name="name">placeholder</property>
+                                                                                <property name="child">
+                                                                                    <object class="AdwStatusPage">
+                                                                                        <property name="icon-name">im.dino.Dino-symbolic</property>
+                                                                                        <property name="hexpand">True</property>
+                                                                                        <property name="vexpand">True</property>
+                                                                                    </object>
+                                                                                </property>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                        <child type="separator">
+                                                            <object class="GtkSeparator" />
+                                                        </child>
+                                                        <child type="flap">
+                                                            <object class="AdwClamp">
+                                                                <property name="hexpand">false</property>
+                                                                <property name="maximum-size">400</property>
+                                                                <property name="tightening-threshold">400</property>
+                                                                <child>
+                                                                    <object class="DinoUiNaturalSizeIncrease">
+                                                                        <property name="min-natural-width">400</property>
+                                                                        <child>
+                                                                            <object class="AdwBin" id="search_frame">
+                                                                                <property name="hexpand">true</property>
+                                                                                <style>
+                                                                                    <class name="background"/>
+                                                                                </style>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </property>
+                                            </object>
+                                        </property>
+                                    </object>
+                                </property>
+                            </object>
+                        </property>
+                    </object>
+                </child>
+            </object>
+        </property>
+    </template>
+</interface>
diff --git a/main/data/main_window_placeholder.ui b/main/data/main_window_placeholder.ui
new file mode 100644
index 00000000..123920fe
--- /dev/null
+++ b/main/data/main_window_placeholder.ui
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <requires lib="gtk" version="4.0"/>
+    <template class="DinoUiMainWindowPlaceholder">
+        <child>
+            <object class="GtkBox" id="box">
+                <property name="orientation">vertical</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <child>
+                    <object class="GtkHeaderBar">
+                        <property name="show-title-buttons">true</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <child>
+                            <object class="AdwStatusPage" id="status_page">
+                                <property name="icon-name">im.dino.Dino-symbolic</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkButton" id="primary_button">
+                                <property name="halign">center</property>
+                                <property name="visible">False</property>
+                                <style>
+                                    <class name="text-button"/>
+                                    <class name="suggested-action"/>
+                                </style>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkButton" id="secondary_button">
+                                <property name="visible">0</property>
+                                <property name="halign">center</property>
+                                <property name="visible">False</property>
+                                <style>
+                                    <class name="text-button"/>
+                                </style>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+        </child>
+    </template>
+</interface>
diff --git a/main/data/style.css b/main/data/style.css
index 007586c5..bc004cb4 100644
--- a/main/data/style.css
+++ b/main/data/style.css
@@ -23,10 +23,6 @@ window.dino-main headerbar.dino-left label.title {
     color: transparent;
 }
 
-window.dino-main .dino-conversation {
-    background: @theme_base_color;
-}
-
 window.dino-main .dino-conversation undershoot,
 window.dino-main .dino-conversation viewport /* Some themes set this */ {
     background: none;
@@ -86,12 +82,6 @@ window.dino-main .unread-count:backdrop {
     color: @theme_unfocused_fg_color;
 }
 
-window.dino-main .dino-sidebar > frame {
-    background: @insensitive_bg_color;
-    border-left: 1px solid @borders;
-    border-bottom: 1px solid @borders;
-}
-
 /* Message */
 
 .message-box {
@@ -257,10 +247,6 @@ window.dino-main .dino-file-overlay {
 
 /* Chat Input*/
 
-window.dino-main .dino-chatinput frame box {
-    background: transparent;
-}
-
 window.dino-main .dino-attach-button {
     min-width: 24px; /* Make button the same width as avatars */
 }
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
deleted file mode 100644
index 45c0d332..00000000
--- a/main/data/unified_main_content.ui
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <requires lib="gtk" version="4.0"/>
-    <object class="AdwLeaflet" id="leaflet">
-        <property name="transition-type">slide</property>
-        <property name="can-navigate-back">true</property>
-        <property name="can-navigate-forward">true</property>
-        <child>
-            <object class="GtkBox" id="left_box">
-                <property name="orientation">vertical</property>
-                <style>
-                    <class name="sidebar"/>
-                </style>
-                <child>
-                    <object class="GtkStack" id="left_stack">
-                        <property name="hexpand">False</property>
-                        <child>
-                            <object class="GtkStackPage">
-                                <property name="name">content</property>
-                                <property name="child">
-                                    <object class="GtkScrolledWindow">
-                                        <property name="hscrollbar_policy">never</property>
-                                        <property name="vexpand">1</property>
-                                        <child>
-                                            <object class="DinoUiConversationSelector" id="conversation_list">
-                                            </object>
-                                        </child>
-                                    </object>
-                                </property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkStackPage">
-                                <property name="name">placeholder</property>
-                                <property name="child">
-                                    <object class="AdwStatusPage">
-                                        <style>
-                                            <class name="compact"/>
-                                        </style>
-                                        <property name="margin-start">20</property>
-                                        <property name="margin-end">20</property>
-                                        <property name="margin-top">20</property>
-                                        <property name="margin-bottom">20</property>
-                                        <property name="width_request">260</property>
-
-                                        <property name="title" translatable="yes">You have no open chats</property>
-                                        <property name="description" translatable="yes">Click + to start a chat or join a channel</property>
-                                    </object>
-                                </property>
-                            </object>
-                        </child>
-                    </object>
-                </child>
-            </object>
-        </child>
-        <child>
-            <object class="GtkBox" id="right_box">
-                <property name="orientation">vertical</property>
-                <child>
-                    <object class="AdwFlap" id="search_flap">
-                        <property name="flap-position">end</property>
-                        <property name="modal">true</property>
-                        <property name="locked">true</property>
-                        <property name="swipe-to-open">false</property>
-                        <property name="fold-threshold-policy">natural</property>
-                        <property name="hexpand">true</property>
-                        <child type="content">
-                            <object class="DinoUiNaturalSizeIncrease">
-                                <property name="min-natural-width">600</property>
-                                <child>
-                                    <object class="GtkStack" id="right_stack">
-                                        <property name="hexpand">false</property>
-                                        <child>
-                                            <object class="GtkStackPage">
-                                                <property name="name">content</property>
-                                                <property name="child">
-                                                    <object class="DinoUiConversationView" id="conversation_view">
-                                                    </object>
-                                                </property>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="GtkStackPage">
-                                                <property name="name">placeholder</property>
-                                                <property name="child">
-                                                    <object class="AdwStatusPage">
-                                                        <property name="icon-name">im.dino.Dino-symbolic</property>
-                                                        <property name="hexpand">True</property>
-                                                        <property name="vexpand">True</property>
-                                                    </object>
-                                                </property>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <child type="separator">
-                            <object class="GtkSeparator" />
-                        </child>
-                        <child type="flap">
-                            <object class="AdwClamp">
-                                <property name="hexpand">false</property>
-                                <property name="maximum-size">400</property>
-                                <property name="tightening-threshold">400</property>
-                                <child>
-                                    <object class="DinoUiNaturalSizeIncrease">
-                                        <property name="min-natural-width">400</property>
-                                        <child>
-                                            <object class="AdwBin" id="search_frame">
-                                                <property name="hexpand">true</property>
-                                                <style>
-                                                    <class name="background"/>
-                                                </style>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                    </object>
-                </child>
-            </object>
-        </child>
-    </object>
-</interface>
diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui
deleted file mode 100644
index 123920fe..00000000
--- a/main/data/unified_window_placeholder.ui
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <requires lib="gtk" version="4.0"/>
-    <template class="DinoUiMainWindowPlaceholder">
-        <child>
-            <object class="GtkBox" id="box">
-                <property name="orientation">vertical</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <child>
-                    <object class="GtkHeaderBar">
-                        <property name="show-title-buttons">true</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <property name="valign">center</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                            <object class="AdwStatusPage" id="status_page">
-                                <property name="icon-name">im.dino.Dino-symbolic</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkButton" id="primary_button">
-                                <property name="halign">center</property>
-                                <property name="visible">False</property>
-                                <style>
-                                    <class name="text-button"/>
-                                    <class name="suggested-action"/>
-                                </style>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkButton" id="secondary_button">
-                                <property name="visible">0</property>
-                                <property name="halign">center</property>
-                                <property name="visible">False</property>
-                                <style>
-                                    <class name="text-button"/>
-                                </style>
-                            </object>
-                        </child>
-                    </object>
-                </child>
-            </object>
-        </child>
-    </template>
-</interface>
-- 
cgit v1.3