GNOME - AccountPage ViewSwitcher

NickvisionApps · Mar 28, 2024 · 54919f9 · 54919f9
1 parent b6d3a03
commit 54919f9
Show file tree

Hide file tree

Showing 40 changed files with 812 additions and 772 deletions.
diff --git a/docs/po/denaro.pot b/docs/po/denaro.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-27 20:25-0400\n"
+"POT-Creation-Date: 2024-03-27 21:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/libdenaro/src/models/account.cpp b/libdenaro/src/models/account.cpp
@@ -1186,4 +1186,4 @@ namespace Nickvision::Money::Shared::Models
     {
         return m_loggedIn;
     }
-}
+}
diff --git a/org.nickvision.money.gnome/blueprints/account_page.blp b/org.nickvision.money.gnome/blueprints/account_page.blp
@@ -1,6 +1,28 @@
 using Gtk 4.0;
 using Adw 1;
 
-Adw.Clamp root {
+Adw.ViewStack root {
+  Adw.ViewStackPage {
+    title: _("Overview");
+    icon-name: "newspaper-symbolic";
+    child: Gtk.Box {
 
+    };
+  }
+
+  Adw.ViewStackPage {
+    title: _("Visualize");
+    icon-name: "profit-symbolic";
+    child: Gtk.Box {
+
+    };
+  }
+
+  Adw.ViewStackPage {
+    title: _("Transactions");
+    icon-name: "money-symbolic";
+    child: Gtk.Box {
+
+    };
+  }
 }
diff --git a/org.nickvision.money.gnome/blueprints/main_window.blp b/org.nickvision.money.gnome/blueprints/main_window.blp
@@ -14,11 +14,13 @@ Adw.ApplicationWindow root {
   default-width: 900;
   default-height: 700;
 
-  Adw.Breakpoint {
+  Adw.Breakpoint breakpoint {
     condition ("max-width: 400sp")
 
     setters {
       navView.collapsed: true;
+      contentHeaderBar.title-widget: null;
+      contentSwitcherBar.reveal: true;
     }
   }
 
@@ -119,7 +121,10 @@ Adw.ApplicationWindow root {
 
       child: Adw.ToolbarView {
         [top]
-        Adw.HeaderBar {}
+        Adw.HeaderBar contentHeaderBar {}
+
+        [bottom]
+        Adw.ViewSwitcherBar contentSwitcherBar {}
 
         content: Adw.ToastOverlay toastOverlay {
           child: Adw.ViewStack viewStack {

diff --git a/org.nickvision.money.gnome/include/views/accountpage.h b/org.nickvision.money.gnome/include/views/accountpage.h
@@ -26,9 +26,9 @@ namespace Nickvision::Money::GNOME::Views
         ~AccountPage();
         /**
          * @brief Gets the gobj of the control
-         * @return AdwClamp*
+         * @return AdwViewStack*
          */
-        AdwClamp* gobj();
+        AdwViewStack* gobj();
         /**
          * @brief Gets the title of the page
          * @return The page title
@@ -39,7 +39,7 @@ namespace Nickvision::Money::GNOME::Views
         std::shared_ptr<Shared::Controllers::AccountViewController> m_controller;
         GtkBuilder* m_builder;
         GtkWindow* m_parent;
-        AdwClamp* m_page;
+        AdwViewStack* m_page;
     };
 }
 

diff --git a/org.nickvision.money.gnome/resources/moon-outline-symbolic.svg b/org.nickvision.money.gnome/resources/moon-outline-symbolic.svg
diff --git a/org.nickvision.money.gnome/resources/newspaper-symbolic.svg b/org.nickvision.money.gnome/resources/newspaper-symbolic.svg
diff --git a/org.nickvision.money.gnome/resources/org.nickvision.money.gresource.xml b/org.nickvision.money.gnome/resources/org.nickvision.money.gresource.xml
@@ -25,9 +25,9 @@
     <file preprocess="xml-stripblanks">money-none-symbolic.svg</file>
     <file preprocess="xml-stripblanks">money-symbolic.svg</file>
     <file preprocess="xml-stripblanks">month-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">moon-outline-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">newspaper-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">profit-symbolic.svg</file>
     <file preprocess="xml-stripblanks">shell-overview-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">sun-outline-symbolic.svg</file>
     <file preprocess="xml-stripblanks">today-symbolic.svg</file>
     <file preprocess="xml-stripblanks">update-symbolic.svg</file>
     <file preprocess="xml-stripblanks">wallet2-symbolic.svg</file>

diff --git a/org.nickvision.money.gnome/resources/profit-symbolic.svg b/org.nickvision.money.gnome/resources/profit-symbolic.svg
diff --git a/org.nickvision.money.gnome/resources/sun-outline-symbolic.svg b/org.nickvision.money.gnome/resources/sun-outline-symbolic.svg
diff --git a/org.nickvision.money.gnome/src/views/accountpage.cpp b/org.nickvision.money.gnome/src/views/accountpage.cpp
@@ -9,7 +9,7 @@ namespace Nickvision::Money::GNOME::Views
         : m_controller(controller),
         m_builder{ BuilderHelpers::fromBlueprint("account_page") },
         m_parent{ parent },
-        m_page{ ADW_CLAMP(gtk_builder_get_object(m_builder, "root")) }
+        m_page{ ADW_VIEW_STACK(gtk_builder_get_object(m_builder, "root")) }
     {
 
     }
@@ -19,7 +19,7 @@ namespace Nickvision::Money::GNOME::Views
         g_object_unref(m_builder);
     }
 
-    AdwClamp* AccountPage::gobj()
+    AdwViewStack* AccountPage::gobj()
     {
         return m_page;
     }

diff --git a/org.nickvision.money.gnome/src/views/mainwindow.cpp b/org.nickvision.money.gnome/src/views/mainwindow.cpp
@@ -229,6 +229,9 @@ namespace Nickvision::Money::GNOME::Views
     void MainWindow::onNavItemSelected(GtkListBox* box, GtkListBoxRow* row)
     {
         adw_navigation_split_view_set_show_content(ADW_NAVIGATION_SPLIT_VIEW(gtk_builder_get_object(m_builder, "navView")), true);
+        //Reset content header and switcher bar
+        adw_header_bar_set_title_widget(ADW_HEADER_BAR(gtk_builder_get_object(m_builder, "contentHeaderBar")), nullptr);
+        adw_view_switcher_bar_set_stack(ADW_VIEW_SWITCHER_BAR(gtk_builder_get_object(m_builder, "contentSwitcherBar")), nullptr);
         if(row == gtk_list_box_get_row_at_index(box, Pages::Home))
         {
             adw_navigation_page_set_title(ADW_NAVIGATION_PAGE(gtk_builder_get_object(m_builder, "navPageContent")), _("Home"));
@@ -256,9 +259,19 @@ namespace Nickvision::Money::GNOME::Views
         else //Account
         {
             const std::shared_ptr<AccountPage>& page{ m_accountPages.at(gtk_widget_get_tooltip_text(GTK_WIDGET(row))) };
+            //Set AccountPage as child
             adw_navigation_page_set_title(ADW_NAVIGATION_PAGE(gtk_builder_get_object(m_builder, "navPageContent")), page->getTitle().c_str());
             adw_view_stack_set_visible_child_name(ADW_VIEW_STACK(gtk_builder_get_object(m_builder, "viewStack")), "custom");
             adw_bin_set_child(ADW_BIN(gtk_builder_get_object(m_builder, "customBin")), GTK_WIDGET(page->gobj()));
+            //Set content header and switcher bar for AccountPage's viewstack
+            if(!adw_navigation_split_view_get_collapsed(ADW_NAVIGATION_SPLIT_VIEW(gtk_builder_get_object(m_builder, "navView"))))
+            {
+                AdwViewSwitcher* viewSwitcher{ ADW_VIEW_SWITCHER(adw_view_switcher_new()) };
+                adw_view_switcher_set_policy(viewSwitcher, ADW_VIEW_SWITCHER_POLICY_WIDE);
+                adw_view_switcher_set_stack(viewSwitcher, page->gobj());
+                adw_header_bar_set_title_widget(ADW_HEADER_BAR(gtk_builder_get_object(m_builder, "contentHeaderBar")), GTK_WIDGET(viewSwitcher));
+            }
+            adw_view_switcher_bar_set_stack(ADW_VIEW_SWITCHER_BAR(gtk_builder_get_object(m_builder, "contentSwitcherBar")), page->gobj());
         }
     }
 

diff --git a/resources/po/ar.po b/resources/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-27 20:25-0400\n"
+"POT-Creation-Date: 2024-03-27 21:59-0400\n"
 "PO-Revision-Date: 2023-12-06 07:04+0000\n"
 "Last-Translator: ButterflyOfFire <[email protected]>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/nickvision-money/"
@@ -254,20 +254,20 @@ msgid "Account Type"
 msgstr "نوع الحساب"
 
 #: org.nickvision.money.gnome/blueprints/new_account_dialog.blp:127
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:332
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:342
 #: org.nickvision.money.winui/NewAccountDialog.xaml.cpp:40
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:424
 msgid "Checking"
 msgstr "جارٍ"
 
 #: org.nickvision.money.gnome/blueprints/new_account_dialog.blp:127
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:335
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:345
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:427
 msgid "Savings"
 msgstr "ادِّخار"
 
 #: org.nickvision.money.gnome/blueprints/new_account_dialog.blp:127
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:338
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:348
 #: org.nickvision.money.winui/NewAccountDialog.xaml.cpp:42
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:430
 msgid "Business"
@@ -452,36 +452,36 @@ msgstr "المساعدة"
 msgid "About Denaro"
 msgstr "عن دينار"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:38
+#: org.nickvision.money.gnome/blueprints/main_window.blp:40
 msgid "Main Menu"
 msgstr "القائمة الرئيسية"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:61
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:234
+#: org.nickvision.money.gnome/blueprints/main_window.blp:63
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:237
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:69
 msgid "Home"
 msgstr "الصفحة الرئيسة"
 
 #. Localize Strings
-#: org.nickvision.money.gnome/blueprints/main_window.blp:78
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:239
+#: org.nickvision.money.gnome/blueprints/main_window.blp:80
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:242
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:80
 #: org.nickvision.money.winui/Controls/CurrencyConverterDialog.xaml.cpp:21
 msgid "Currency Converter"
 msgstr "مُحوّل عملات"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:88
+#: org.nickvision.money.gnome/blueprints/main_window.blp:90
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:71
 msgid "Accounts"
 msgstr "الحسابات"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:107
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:245
+#: org.nickvision.money.gnome/blueprints/main_window.blp:109
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:248
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:70
 msgid "Dashboard"
 msgstr "لوح المعلومات"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:130
+#: org.nickvision.money.gnome/blueprints/main_window.blp:135
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:111
 msgid ""
 "Create or open an account to get started. You may also drag a file into the "
@@ -490,39 +490,39 @@ msgstr ""
 "أنشئ أو افتح حسابًا لتبدأ، ولك إن شئت أن تفلت ملفًّا على التطبيق من متصفِّح "
 "الملفَّات."
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:142
+#: org.nickvision.money.gnome/blueprints/main_window.blp:147
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:398
 msgid "No Recent Accounts"
 msgstr "لا توجد حسابات استخدمت مؤخَّرًا"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:162
-#: org.nickvision.money.gnome/blueprints/main_window.blp:180
-#: org.nickvision.money.gnome/blueprints/main_window.blp:198
+#: org.nickvision.money.gnome/blueprints/main_window.blp:167
+#: org.nickvision.money.gnome/blueprints/main_window.blp:185
+#: org.nickvision.money.gnome/blueprints/main_window.blp:203
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:417
 msgid "Remove"
 msgstr "أزل"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:211
+#: org.nickvision.money.gnome/blueprints/main_window.blp:216
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:82
 #, fuzzy
 msgid "New"
 msgstr "جديد"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:212
+#: org.nickvision.money.gnome/blueprints/main_window.blp:217
 msgid "New Account (Ctrl+N)"
 msgstr "حساب جديد (Ctrl + N)"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:220
+#: org.nickvision.money.gnome/blueprints/main_window.blp:225
 #: org.nickvision.money.gnome/src/views/mainwindow.cpp:145
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:83
 msgid "Open"
 msgstr "افتح"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:221
+#: org.nickvision.money.gnome/blueprints/main_window.blp:226
 msgid "Open Account (Ctrl+O)"
 msgstr "افتح حسابًا (Ctrl + O)"
 
-#: org.nickvision.money.gnome/blueprints/main_window.blp:238
+#: org.nickvision.money.gnome/blueprints/main_window.blp:243
 #, fuzzy
 msgid "No Accounts Open"
 msgstr "نوع الحساب"
@@ -639,7 +639,7 @@ msgid "Account"
 msgstr "الحساب"
 
 #: org.nickvision.money.gnome/blueprints/shortcuts_dialog.blp:21
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:297
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:307
 msgid "Open Account"
 msgstr "افتح حسابًا"
 
@@ -711,23 +711,23 @@ msgstr ""
 msgid "GitHub Repo"
 msgstr "مستودع جت‌هب"
 
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:299
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:309
 #, fuzzy
 msgid "Nickvision Denaro Account (*.nmoney)"
 msgstr "حساب نِكفِجِن دِنارو"
 
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:367
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:377
 #: org.nickvision.money.winui/NewAccountDialog.xaml.cpp:32
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:455
 msgid "Enter password here"
 msgstr "أدخل كلمة السرِّ هنا"
 
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:375
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:385
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:464
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: org.nickvision.money.gnome/src/views/mainwindow.cpp:375
+#: org.nickvision.money.gnome/src/views/mainwindow.cpp:385
 #: org.nickvision.money.winui/MainWindow.xaml.cpp:463
 msgid "Unlock"
 msgstr "افتح"
-Original file line number
+Diff line change
@@ Expand Up / @@ -1186,4 +1186,4 @@ namespace Nickvision::Money::Shared::Models @@
         {
             return m_loggedIn;
         }
-    }
+    }