From 876b51e784f4d86fd538f45680314517bd139678 Mon Sep 17 00:00:00 2001
From: Hannes Schulze <haschu0103@outlook.de>
Date: Sat, 21 Jun 2025 09:42:22 +0200
Subject: use updated gi-gtk

---
 app/Foobar/Application.hs | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 app/Main.hs               | 43 ++++++--------------------------
 app/foobar.cabal          |  6 ++++-
 3 files changed, 75 insertions(+), 36 deletions(-)
 create mode 100644 app/Foobar/Application.hs

(limited to 'app')

diff --git a/app/Foobar/Application.hs b/app/Foobar/Application.hs
new file mode 100644
index 0000000..5713cc3
--- /dev/null
+++ b/app/Foobar/Application.hs
@@ -0,0 +1,62 @@
+{-# LANGUAGE GHC2021 #-}
+{-# LANGUAGE OverloadedStrings, OverloadedLabels, OverloadedRecordDot, ImplicitParams #-}
+
+module Foobar.Application
+  ( mkApplication
+  ) where
+
+import Data.Maybe (fromJust)
+import Data.GI.Base
+import Data.Text
+import GHC.Generics (Generic)
+import Declarative.Gtk
+
+import qualified GI.Gtk as Gtk
+import qualified GI.Gdk as Gdk
+import qualified GI.Gio as Gio
+import qualified GI.Foobar as FB
+
+mkApplication :: IO Gtk.Application
+mkApplication = new Gtk.Application [ #applicationId := "com.github.hannesschulze.foobar-hs"
+                                    , On #activate (onActivate ?self) ]
+
+newtype AppState
+  = AppState { stateText :: Text }
+  deriving (Generic)
+
+data Message = MsgQuit | MsgDoSomething
+
+initialState :: AppState
+initialState = AppState { stateText = "Do something" }
+
+appView :: View AppState Message Gtk.Widget
+appView state emit = widget DeclarativeBox [ #children := children
+                                           , #orientation := Gtk.OrientationVertical
+                                           , #spacing := 12]
+  where children = [ widget Gtk.Button [ #label :<~ state.stateText
+                                       , On #clicked (emit MsgDoSomething) ]
+                   , widget Gtk.Button [ #label := "Quit"
+                                       , On #clicked (emit MsgQuit) ] ]
+
+appHandler :: Handler Message AppState
+appHandler MsgQuit _ = pure ()
+appHandler MsgDoSomething s = s.stateText <~ "Did something!"
+
+onActivate :: Gtk.Application -> IO ()
+onActivate app = do
+  provider <- new Gtk.CssProvider []
+  provider.loadFromResource "/foobar/styles/default.css"
+  disp <- Gdk.displayGetDefault
+  Gtk.styleContextAddProviderForDisplay (fromJust disp)
+                                        provider
+                                        (fromIntegral Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+  view <- mvh initialState appView appHandler
+  window <- new Gtk.ApplicationWindow [ #application := app
+                                      , #title := "Test"
+                                      , #child := view ]
+  _ <- FB.serverProxyNewForBusSync Gio.BusTypeSession
+                                   []
+                                   "com.github.hannesschulze.foobar"
+                                   "/com/github/hannesschulze/foobar/server"
+                                   (Nothing :: Maybe Gio.Cancellable)
+  window.show
diff --git a/app/Main.hs b/app/Main.hs
index 25ad7d4..4f7e757 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,42 +1,15 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE OverloadedRecordDot #-}
-{-# LANGUAGE ImplicitParams #-}
+{-# LANGUAGE OverloadedStrings, OverloadedRecordDot #-}
 
 import Control.Monad (void)
 import Control.Exception (bracket_)
-import Data.Maybe (fromJust)
-import Data.GI.Base
+import System.Environment (getArgs)
+import Foobar.Application (mkApplication)
 
-import qualified GI.Gtk as Gtk
-import qualified GI.Gdk as Gdk
-import qualified GI.Gio as Gio
 import qualified GI.Foobar as FB
 
-activate :: Gtk.Application -> IO ()
-activate app = do
-  provider <- new Gtk.CssProvider []
-  provider.loadFromResource "/foobar/styles/default.css"
-  disp <- Gdk.displayGetDefault
-  Gtk.styleContextAddProviderForDisplay (fromJust disp)
-                                        provider
-                                        (fromIntegral Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-  button <- new Gtk.Button [ #label := "Hello, world!" ]
-  window <- new Gtk.ApplicationWindow [ #application := app
-                                      , #title := "Test"
-                                      , #child := button ]
-  _ <- FB.serverProxyNewForBusSync Gio.BusTypeSession
-                                   []
-                                   "com.github.hannesschulze.foobar"
-                                   "/com/github/hannesschulze/foobar/server"
-                                   (Nothing :: Maybe Gio.Cancellable)
-  window.show
-
 main :: IO ()
-main = do
-  bracket_
-    (do FB.stylesRegisterResource; FB.iconsRegisterResource)
-    (do FB.stylesUnregisterResource; FB.iconsUnregisterResource) $
-    do app <- new Gtk.Application [ #applicationId := "com.github.hannesschulze.foobar-hs"
-                                  , On #activate (activate ?self) ]
-       void $ app.run Nothing
+main = bracket_ FB.stylesRegisterResource FB.stylesUnregisterResource $
+       bracket_ FB.iconsRegisterResource  FB.iconsUnregisterResource  $
+         do args <- getArgs
+            app  <- mkApplication
+            void $ app.run (Just ("com.github.hannesschulze.foobar" : args))
diff --git a/app/foobar.cabal b/app/foobar.cabal
index bee0858..9ac41ba 100644
--- a/app/foobar.cabal
+++ b/app/foobar.cabal
@@ -16,5 +16,9 @@ executable foobar
                       gi-gio,
                       gi-gtk4,
                       gi-gdk4,
-                      gi-foobar
+                      gi-foobar,
+                      declarative-gtk,
+                      optics-core,
+                      text
+    other-modules:    Foobar.Application
     default-language: Haskell2010
-- 
cgit v1.3.1