@@ -1,10 +1,16 @@

-CJAWSAccess.app: app.icns deliver.lisp src/*.lisp aws-access.asd accounts.json AuthorizeShell.scpt

-	/Applications/LispWorks\ 7.1\ \(64-bit\)/LispWorks\ \(64-bit\).app/Contents/MacOS/lispworks-7-1-0-amd64-darwin -build deliver.lisp

-	cp AuthorizeShell.scpt CJAWSAccess.app/Contents/Resources/

+ASSET_DIRS = $(shell find assets/ -type d)

+ASSET_FILES = $(shell find assets/ -type f)

+

+all: app.icns CJAWSAccess.app accounts.json $(ASSET_DIRS) $(ASSET_FILES)

+	rsync -arvh assets/ CJAWSAccess.app/Contents/Resources/

 	cp accounts.json CJAWSAccess.app/Contents/Resources/accounts.json

 	cp app.icns CJAWSAccess.app/Contents/Resources/app.icns

 	touch CJAWSAccess.app

+CJAWSAccess.app: deliver.lisp src/*.lisp aws-access.asd addFonts.patch

+	/Applications/LispWorks\ 7.1\ \(64-bit\)/LispWorks\ \(64-bit\).app/Contents/MacOS/lispworks-7-1-0-amd64-darwin -build deliver.lisp

+	patch -N -p0 < addFonts.patch

+

 accounts.json: accounts.yml

 	./flip-yaml.lisp accounts.yml

new file mode 100644

@@ -0,0 +1,10 @@

+--- CJAWSAccess.app/Contents/Info.plist	2019-10-08 12:04:02.442213658 -0700

+@@ -24,5 +24,7 @@

+ 	<string>7.1.2</string>

+ 	<key>NSPrincipalClass</key>

+ 	<string>NSApplication</string>

++   <key>ATSApplicationFontsPath</key>

++   <string>Fonts/</string>

+ </dict>

+ </plist>

similarity index 100%

rename from AuthorizeShell.scpt

rename to assets/AuthorizeShell.scpt

new file mode 100644

Binary files /dev/null and b/assets/Fonts/LispM-Monospace.ttf differ

new file mode 100644

Binary files /dev/null and b/assets/splash.png differ

@@ -148,7 +148,46 @@

   (interface :default-account 

              (ubiquitous:value :default-account)))

+

+(defun show-splash (&optional (image (bundle-resource "splash.png")))

+  (let* ((image (make-instance 'capi:image-pinboard-object

+                               :x 0 :y 0

+                               :image image

+                               :graphics-args '(:background :gray)))

+         (text (make-instance 'capi:item-pinboard-object

+                              :x 90 :y 450

+                              :text (format nil "( Cloud Access )")

+                              :graphics-args '(:font #s(graphics-ports:font

+                                                        :font-description #s(graphics-ports:font-description

+                                                                             :attributes (:name "LispM-Monospace"

+                                                                                          :family "LispM"

+                                                                                          :size 36.0d0

+                                                                                          :weight :demi

+                                                                                          :slant :roman

+                                                                                          :pitch :fixed))

+                                                        :device-font nil)

+                                               :background :transparent)))

+         (interface (destructuring-bind ((_ __ width height))

+                        (capi:screen-monitor-geometries (capi:convert-to-screen))

+                      (declare (ignore _ __))

+                      (make-instance 'capi:interface

+                                     :best-x (floor (- width 512) 2)

+                                     :best-y (floor (- height 512) 2)

+                                     :layout (make-instance 'capi:pinboard-layout

+                                                            :description (list image text))

+                                     :window-styles '(:borderless :internal-borderless :shadowed

+                                                      :movable-by-window-background :textured-background)))))

+

+

+    (prog1 (capi:display interface)

+      (mp:process-run-function "foo" ()

+                               (lambda ()

+                                 (sleep 2)

+                                 (capi:apply-in-pane-process interface

+                                                             'capi:destroy interface))))))

+

 (defun main ()

+  (show-splash)

   (setf *debugger-hook* 'debugging

         *print-readably* nil

         *accounts* (reprocess-accounts (load-accounts)))

@@ -7,6 +7,10 @@

                                     (objc:invoke "NSBundle" "mainBundle") 

                                     "pathForResource:ofType:" "app" "icns"))))

+(defun bundle-resource (relpath)

+  (merge-pathnames relpath

+                   (bundle-resource-root)))

+

 (defun clear-cookies ()

   (let ((cookie-storage (objc:invoke "NSHTTPCookieStorage" "sharedHTTPCookieStorage")))

     (map nil