From 21ae42762d8a57da5cb1ec40b46e7510fc3121ad Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 12:05:20 +0200
Subject: Redesign and rewrite accounts and settings dialog into a combined one

---
 main/data/gresource.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'main/data/gresource.xml')

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 282838e0..f436ce68 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/im/dino/Dino">
+    <file>account_picker_row.ui</file>
     <file>add_conversation/add_contact_dialog.ui</file>
     <file>add_conversation/add_groupchat_dialog.ui</file>
     <file>add_conversation/conference_details_fragment.ui</file>
@@ -66,6 +67,9 @@
     <file>occupant_list.ui</file>
     <file>occupant_list_item.ui</file>
     <file>quote.ui</file>
+    <file>preferences_window.ui</file>
+    <file>preferences_window_account.ui</file>
+    <file>preferences_window_general.ui</file>
     <file>search_autocomplete.ui</file>
     <file>settings_dialog.ui</file>
     <file>style-dark.css</file>
-- 
cgit v1.2.3-70-g09d2


From 680f0dd0a768b201b62899905c38210e834dde91 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 13:47:25 +0200
Subject: Fix meson build files

---
 main/data/gresource.xml            | 1 -
 plugins/omemo/meson.build          | 3 +++
 plugins/openpgp/data/gresource.xml | 5 ++---
 plugins/openpgp/meson.build        | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'main/data/gresource.xml')

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index f436ce68..30d0e288 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -71,7 +71,6 @@
     <file>preferences_window_account.ui</file>
     <file>preferences_window_general.ui</file>
     <file>search_autocomplete.ui</file>
-    <file>settings_dialog.ui</file>
     <file>style-dark.css</file>
     <file>style.css</file>
     <file>unified_main_content.ui</file>
diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build
index 05d7c265..315f69f4 100644
--- a/plugins/omemo/meson.build
+++ b/plugins/omemo/meson.build
@@ -65,5 +65,8 @@ c_args = [
 vala_args = [
     '--vapidir', meson.current_source_dir() / 'vapi',
 ]
+if dep_libadwaita.version() == 'unknown' or dep_libadwaita.version().version_compare('>=1.2')
+    vala_args += ['-D', 'Adw_1_2']
+endif
 lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins')
 dep_omemo = declare_dependency(link_with: lib_omemo, include_directories: include_directories('.'))
diff --git a/plugins/openpgp/data/gresource.xml b/plugins/openpgp/data/gresource.xml
index fbe2e8e9..75f25e67 100644
--- a/plugins/openpgp/data/gresource.xml
+++ b/plugins/openpgp/data/gresource.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/im/dino/Dino/openpgp">
-    <file>account_settings_item.ui</file>
-  </gresource>
+<!--  <gresource prefix="/im/dino/Dino/openpgp">-->
+<!--  </gresource>-->
 </gresources>
diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build
index ec6f5c0e..ad1614d6 100644
--- a/plugins/openpgp/meson.build
+++ b/plugins/openpgp/meson.build
@@ -14,6 +14,7 @@ sources = files(
     'src/contact_details_provider.vala',
     'src/database.vala',
     'src/encryption_list_entry.vala',
+    'src/encryption_preferences_entry.vala',
     'src/file_transfer/file_decryptor.vala',
     'src/file_transfer/file_encryptor.vala',
     'src/gpgme_fix.c',
-- 
cgit v1.2.3-70-g09d2


From 984ae3f5b89081f97696cd5051167a18159aa60b Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 18:39:25 +0200
Subject: Settings dialog: Fix account subpage for Adwaita < 1.4, other fixes

fixes #1592
---
 main/data/gresource.xml                                              | 1 +
 main/data/preferences_window_account.ui                              | 3 +--
 main/src/ui/main_window_controller.vala                              | 2 +-
 main/src/windows/preferences_window/account_preferences_subpage.vala | 4 ++++
 plugins/omemo/CMakeLists.txt                                         | 3 ---
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'main/data/gresource.xml')

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 30d0e288..ddf7ccf9 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -11,6 +11,7 @@
     <file>chat_input.ui</file>
     <file>conversation_content_view/item_metadata_header.ui</file>
     <file>conversation_content_view/view.ui</file>
+    <file>conversation_details.css</file>
     <file>conversation_details.ui</file>
     <file>conversation_item_widget.ui</file>
     <file>conversation_list_titlebar.ui</file>
diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window_account.ui
index 4280422d..e0fa4f76 100644
--- a/main/data/preferences_window_account.ui
+++ b/main/data/preferences_window_account.ui
@@ -4,11 +4,10 @@
   <template class="DinoUiAccountPreferencesSubpage">
     <property name="orientation">vertical</property>
     <child>
-      <object class="AdwHeaderBar">
+      <object class="AdwHeaderBar" id="headerbar">
         <style>
           <class name="flat"/>
         </style>
-        <property name="show-title">False</property>
         <child>
           <object class="GtkButton" id="back_button">
             <property name="icon-name">go-previous-symbolic</property>
diff --git a/main/src/ui/main_window_controller.vala b/main/src/ui/main_window_controller.vala
index 7a3ebcb2..2e270663 100644
--- a/main/src/ui/main_window_controller.vala
+++ b/main/src/ui/main_window_controller.vala
@@ -69,7 +69,7 @@ public class MainWindowController : Object {
             dialog.set_transient_for(app.get_active_window());
             dialog.present();
         });
-        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); });
+        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("preferences", null); });
         window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation));
 
 //        ConversationListModel list_model = new ConversationListModel(stream_interactor);
diff --git a/main/src/windows/preferences_window/account_preferences_subpage.vala b/main/src/windows/preferences_window/account_preferences_subpage.vala
index 462fc8e1..01cf5584 100644
--- a/main/src/windows/preferences_window/account_preferences_subpage.vala
+++ b/main/src/windows/preferences_window/account_preferences_subpage.vala
@@ -8,6 +8,7 @@ using Gdk;
 [GtkTemplate (ui = "/im/dino/Dino/preferences_window_account.ui")]
 public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
 
+    [GtkChild] public unowned Adw.HeaderBar headerbar;
     [GtkChild] public unowned Button back_button;
     [GtkChild] public unowned AvatarPicture avatar;
     [GtkChild] public unowned Adw.ActionRow xmpp_address;
@@ -30,6 +31,9 @@ public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
     private ulong alias_entry_changed = 0;
 
     construct {
+#if Adw_1_4
+        headerbar.show_title = false;
+#endif
         button_container.layout_manager = new NaturalDirectionBoxLayout((BoxLayout)button_container.layout_manager);
         back_button.clicked.connect(() => {
             var window = (Adw.PreferencesWindow) this.get_root();
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index 9e290390..a8920d72 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -39,9 +39,6 @@ if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2")
     set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2)
 endif()
 
-message(STATUS ${Adwaita_VERSION})
-message(STATUS ${Adw_1_2})
-
 vala_precompile(OMEMO_VALA_C
 SOURCES
     src/dtls_srtp_verification_draft.vala
-- 
cgit v1.2.3-70-g09d2


From 00188bdf9bd91de34060eed195c9fd7a04c8871f Mon Sep 17 00:00:00 2001
From: Miquel Lionel <lionel@les-miquelots.net>
Date: Fri, 8 Dec 2023 02:02:29 +0100
Subject: Show contact status in "Start chat" window

should close #139
- adds svg dino-status-offline.svg
---
 main/CMakeLists.txt                                |  1 +
 main/data/add_conversation/list_row.ui             |  9 ++++++++
 main/data/gresource.xml                            |  1 +
 .../icons/scalable/status/dino-status-offline.svg  |  6 +++++
 main/src/ui/add_conversation/conference_list.vala  |  1 +
 main/src/ui/add_conversation/list_row.vala         | 27 ++++++++++++++++++++++
 6 files changed, 45 insertions(+)
 create mode 100644 main/data/icons/scalable/status/dino-status-offline.svg

(limited to 'main/data/gresource.xml')

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index d5fc66be..2c533907 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -49,6 +49,7 @@ set(RESOURCE_LIST
     icons/scalable/status/dino-status-chat.svg
     icons/scalable/status/dino-status-dnd.svg
     icons/scalable/status/dino-status-online.svg
+    icons/scalable/status/dino-status-offline.svg
     icons/scalable/status/dino-tick-symbolic.svg
     icons/scalable/status/dino-video-off-symbolic.svg
     icons/scalable/status/dino-video-symbolic.svg
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index b8a97174..d829dc3a 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -14,6 +14,15 @@
                 <property name="valign">center</property>
             </object>
         </child>
+        <child>
+          <object class="GtkImage" id="status_dot">
+                <property name="pixel-size">10</property>
+                <layout>
+                    <property name="column">1</property>
+                    <property name="row">0</property>
+                </layout>
+          </object>
+        </child>
         <child>
             <object class="GtkGrid">
                 <property name="valign">center</property>
diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index ddf7ccf9..8717fa85 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -51,6 +51,7 @@
     <file>icons/scalable/status/dino-status-chat.svg</file>
     <file>icons/scalable/status/dino-status-dnd.svg</file>
     <file>icons/scalable/status/dino-status-online.svg</file>
+    <file>icons/scalable/status/dino-status-offline.svg</file>
     <file>icons/scalable/status/dino-tick-symbolic.svg</file>
     <file>icons/scalable/status/dino-video-off-symbolic.svg</file>
     <file>icons/scalable/status/dino-video-symbolic.svg</file>
diff --git a/main/data/icons/scalable/status/dino-status-offline.svg b/main/data/icons/scalable/status/dino-status-offline.svg
new file mode 100644
index 00000000..58f75de2
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-status-offline.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28.222mm" height="28.222mm" version="1.1" viewBox="0 0 99.999997 99.999997" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-62.857 -678.08)">
+  <circle cx="112.86" cy="728.08" r="50" style="fill-rule:evenodd;fill:grey;"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/main/src/ui/add_conversation/conference_list.vala b/main/src/ui/add_conversation/conference_list.vala
index 0b630ae4..bf6191fa 100644
--- a/main/src/ui/add_conversation/conference_list.vala
+++ b/main/src/ui/add_conversation/conference_list.vala
@@ -103,6 +103,7 @@ internal class ConferenceListRow : ListRow {
         this.account = account;
         this.bookmark = bookmark;
 
+        status_dot.visible = false;
         name_label.label = bookmark.name != null && bookmark.name != "" ? bookmark.name : bookmark.jid.to_string();
         if (stream_interactor.get_accounts().size > 1) {
             via_label.label = "via " + account.bare_jid.to_string();
diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala
index c5e344d0..8e4cbb9b 100644
--- a/main/src/ui/add_conversation/list_row.vala
+++ b/main/src/ui/add_conversation/list_row.vala
@@ -11,6 +11,7 @@ public class ListRow : Widget {
     public Grid outer_grid;
     public AvatarPicture picture;
     public Label name_label;
+    public Image status_dot;
     public Label via_label;
 
     public Jid? jid;
@@ -21,14 +22,39 @@ public class ListRow : Widget {
         outer_grid = (Grid) builder.get_object("outer_grid");
         picture = (AvatarPicture) builder.get_object("picture");
         name_label = (Label) builder.get_object("name_label");
+        status_dot = (Image) builder.get_object("status_dot");
         via_label = (Label) builder.get_object("via_label");
 
+
         this.layout_manager = new BinLayout();
         outer_grid.set_parent(this);
     }
 
     public ListRow() {}
 
+    private void set_status_dot(StreamInteractor stream_interactor, Jid jid, Account account){
+        Gee.List<Jid>? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(jid, account);
+        string presence_str = null;
+        if (full_jids != null){
+            int devices = 0;
+            string newline_if_more_devices;
+            for (int i = 0; i < full_jids.size; i++) {
+                Jid full_jid = full_jids[i];
+                presence_str = stream_interactor.get_module(PresenceManager.IDENTITY).get_last_show(full_jid, account);
+                if(presence_str != null) devices += 1;
+                newline_if_more_devices = devices > 1 ? "\r\n" : "";
+                switch(presence_str){
+                        case "dnd": this.status_dot.set_from_icon_name("dino-status-dnd"); i = full_jids.size; break; // dnd detected = marked as dnd for all devices
+                        case "online": this.status_dot.set_from_icon_name("dino-status-online"); i = full_jids.size; break;
+                        case "away": this.status_dot.set_from_icon_name("dino-status-away"); break;
+                        case "xa": this.status_dot.set_from_icon_name("dino-status-away"); break;
+                        case "chat": this.status_dot.set_from_icon_name("dino-status-chat"); break;
+                }
+            }
+        }
+        else status_dot.set_from_icon_name("dino-status-offline");
+    }
+
     public ListRow.from_jid(StreamInteractor stream_interactor, Jid jid, Account account, bool show_account) {
         this.jid = jid;
         this.account = account;
@@ -46,6 +72,7 @@ public class ListRow : Widget {
         }
         name_label.label = display_name;
         picture.model = new ViewModel.CompatAvatarPictureModel(stream_interactor).set_conversation(conv);
+        set_status_dot(stream_interactor, jid, account);
     }
 
     public override void dispose() {
-- 
cgit v1.2.3-70-g09d2