code style

Author: teamcons

src/Application.vala

@@ -28,7 +28,7 @@ At some point i may move this in its own file
 
 namespace Jorts {
     public class Application : Gtk.Application {
-        public Gee.ArrayList<StickyNoteWindow> open_notes = new Gee.ArrayList<StickyNoteWindow>();
+        public static Gee.ArrayList<StickyNoteWindow> open_notes;
         public static GLib.Settings gsettings;
 
         public Application () {
@@ -67,17 +67,6 @@ namespace Jorts {
                     );
             }); 
 
-            //  var portal = new Xdp.Portal();
-            //  GenericArray<weak string> cmd = new GenericArray<weak string> ();
-            //  cmd.add ("io.github.ellie_commons.jorts");
-
-            //  portal.request_background(
-            //      null, 
-            //      "autostart", 
-            //      cmd, 
-            //      Xdp.BackgroundFlags.AUTOSTART, 
-            //      null);
-
             // build all the stylesheets
             Jorts.Themer.init_all_themes();
         }
@@ -153,15 +142,15 @@ namespace Jorts {
     // Create new instances of StickyNoteWindow
     // If we have data, nice, just load it into a new instance
     // Else we do a lil new note
-	public void create_note(NoteData? data) {
+	public void create_note(NoteData? data = null) {
         StickyNoteWindow note;
         if (data != null) {
             note = new StickyNoteWindow(this, data);
         }
         else {
 
             // Skip theme from previous window, but use same text zoom
-            StickyNoteWindow last_note = this.open_notes.last ();
+            StickyNoteWindow last_note = open_notes.last ();
             string skip_theme = last_note.theme;
             var random_data = Jorts.Utils.random_note(skip_theme);
 
@@ -171,14 +160,14 @@ namespace Jorts {
             random_data.zoom = this.latest_zoom;
             note = new StickyNoteWindow(this, random_data);
         }
-        this.open_notes.add(note);
+        open_notes.add(note);
         this.save_to_stash ();
 	}
 
     // Simply remove from the list of things to save, and close
     public void remove_note(StickyNoteWindow note) {
             debug ("Removing a note…\n");
-            this.open_notes.remove (note);
+            open_notes.remove (note);
             this.save_to_stash ();
 	}
 
@@ -206,8 +195,6 @@ namespace Jorts {
         }
     }
 
-
-
     public void show_all() {
         foreach (var window in open_notes) {
             if (window.visible) {
@@ -217,8 +204,6 @@ namespace Jorts {
     }
 
 
-
-
     /*************************************************/
     public void init_all_notes () {
         Gee.ArrayList<NoteData> loaded_data = Jorts.Stash.load_from_stash();
@@ -234,7 +219,7 @@ namespace Jorts {
             print("Doing a backup! :)");
 
             Jorts.Stash.check_if_stash ();
-            string json_data = Jorts.Jason.jsonify (this.open_notes);
+            string json_data = Jorts.Jason.jsonify (open_notes);
             Jorts.Stash.overwrite_stash (json_data, Jorts.Constants.FILENAME_BACKUP);
 
             var now = new DateTime.now_utc ().to_string() ;
@@ -243,9 +228,6 @@ namespace Jorts {
 
     }
 
-
-
-
         /*************************************************/
         protected override int command_line (ApplicationCommandLine command_line) {
             PreferenceWindow preferences;
@@ -254,19 +236,16 @@ namespace Jorts {
             switch (args[1]) {
 
                 case "--new-note":
-                    activate ();    
-                    create_note(null);
+                    activate ();
+                    
+                    create_note();
                     break;
 
                 case "--preferences":
                     activate ();
                     preferences = new Jorts.PreferenceWindow();
                     break;
 
-                case "--dump":
-                    print(Jorts.Jason.jsonify (open_notes));
-                    break;
-
                 default:
                     activate ();
                     break;

src/Objects/NoteData.vala

@@ -29,7 +29,9 @@ namespace Jorts {
         public int width;
         public int height;
 
-        public NoteData (string title, string theme, string content, int zoom, int width, int height)
+        public NoteData (
+            string? title = null, string? theme = null, string? content = null,
+            int? zoom = null, int? width = null, int? height = null)
         {
             this.title = title;
             this.theme = theme;

src/Services/Constants.vala

@@ -30,8 +30,8 @@ namespace Jorts.Constants {
 
 
     /*************************************************/
-    const string RDNN               = "io.github.ellie_commons.jorts";
-    const string DONATE_LINK            = "https://ko-fi.com/teamcons";
+    const string RDNN                    = "io.github.ellie_commons.jorts";
+    const string DONATE_LINK             = "https://ko-fi.com/teamcons";
 
     // signature theme
     const string DEFAULT_THEME           = "BLUEBERRY";
@@ -40,7 +40,7 @@ namespace Jorts.Constants {
     const string FILENAME_BACKUP         = "backup_state.json";
 
     // in ms
-    const int DEBOUNCE       = 1000;
+    const int DEBOUNCE                   = 1000;
 
     // We need to say stop at some point
     const int ZOOM_MAX                   = 240;

src/Services/Utils.vala

@@ -80,7 +80,7 @@ namespace Jorts.Utils {
     // Spits out a random theme for a new note
     // If there is the name of a string to skip, just skip it.
     // Having an gee.arraylist defined from the start only causes issues
-    public string random_theme (string? skip_theme) {
+    public string random_theme (string? skip_theme = null) {
         Gee.ArrayList<string> themes = new Gee.ArrayList<string> ();
         themes.add_all_array (Jorts.Constants.THEMES);
 
@@ -143,7 +143,7 @@ namespace Jorts.Utils {
 
     /*************************************************/
     // Spits out a cute or funny random title for a new sticky note
-    public string random_emote (string? skip_emote) {
+    public string random_emote (string? skip_emote = null) {
 
         Gee.ArrayList<string> allemotes = new Gee.ArrayList<string> ();
         allemotes.add_all_array (Jorts.Constants.EMOTES);
@@ -193,7 +193,7 @@ Have a great day!🎇
 
     /*************************************************/
     // Spits out a fresh new note
-    public NoteData random_note (string? skip_theme) {
+    public NoteData random_note (string? skip_theme = null) {
         debug("Generating random note... Skip:" + skip_theme);
         var randtitle = Jorts.Utils.random_title ();
         string randtheme = Jorts.Utils.random_theme (skip_theme);