get some redundancies out

Author: teamcons

src/Application.vala

@@ -51,18 +51,7 @@ namespace jorts {
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
             );
 
-            string[] themes = {
-                "STRAWBERRY",
-                "ORANGE",
-                "BANANA",
-                "LIME",
-                "BLUEBERRY",
-                "BUBBLEGUM",
-                "GRAPE",
-                "COCOA",
-                "SILVER",
-                "SLATE"
-            };
+            string[] themes = jorts.Utils.themearray ();
 
             foreach (unowned var theme in themes) {
               // Palette color

src/MainWindow.vala

@@ -75,7 +75,8 @@ namespace jorts {
                 // First sticky is always blue - signature look!
                 // After that, it is random
                 //if (uid_counter == 0) {
-                    this.theme = jorts.Utils.random_theme();
+                    var allthemes = jorts.Utils.themearray();
+                    this.theme = allthemes[Random.int_range (0,(allthemes.length - 1))];
                 //} else {
                 //    this.theme = "BLUEBERRY";
                 //}

src/Services/Themer.vala

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2025 Stella
+* Copyright (c) 2025 Stella and the Ellie_Commons community
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public
@@ -54,16 +54,7 @@ namespace jorts.Themer {
             }
 
             window.%s .titlebar image,
-            window.%s .editablelabel {
-                color: @%s_900;
-            }
-
-            window.%s:backdrop .editablelabel,
-            window.%s:backdrop .actionbar,
-            window.%s:backdrop .actionbar image {
-                color: @%s_500;
-            }
-
+            window.%s .editablelabel,
             window.%s .actionbar,
             window.%s .actionbar image {
                 color: @%s_900;
@@ -76,6 +67,16 @@ namespace jorts.Themer {
                 border-bottom-color: @%s_100;
                 color: shade(@%s_900, 0.77);
             }
+
+
+            window.%s:backdrop .sourceview text,
+            window.%s:backdrop .editablelabel,
+            window.%s:backdrop .actionbar,
+            window.%s:backdrop .actionbar image {
+                color: @%s_700;
+            }
+
+
         """));
 
         style = style.replace ("%s",theme);

src/Services/Utils.vala

@@ -20,8 +20,7 @@
 
 namespace jorts.Utils {
 
-    /* Get a name, spit an array with colours from standard granite stylesheet */
-    /* EX: STRAWBERRY --> { "@STRAWBERRY_100" "@STRAWBERRY_900" }*/
+    // Spits out a cute or funny random title for a new sticky note
     public string random_title () {
         string[] alltitles = {
             _("All my very best friends"),
@@ -37,19 +36,27 @@ namespace jorts.Utils {
             _("Hello world!"),
             _("New sticky, new me"),
             _("Hidden pirate treasure"),
-            _("To not forget"),
+            _("To not forget, ever"),
             _("Deep deep thoughts"),
             _("Dear Diary,"),
             _("Hi im a square"),
             _("Have a nice day! :)"),
             _("My meds schedule"),
-            _("Household chores"),};
+            _("Household chores"),
+            _("Ode to my cat"),
+            _("My dogs favourite toys"),
+            _("How cool my birds are"),
+            _("Suspects in the Last Cookie affair"),
+            _("Words my parrots know"),
+            _("Cool and funny compliments to give out"),
+            _("Ok, listen here,"),
+            _("My dream Pokemon team")};
 
         return alltitles[Random.int_range (0,(alltitles.length - 1))];
     }
 
-
-    public string random_theme () {
+    // Spits out a random theme for a new note
+    public string[] themearray () {
         string[] allthemes = {
             "STRAWBERRY",
             "ORANGE",
@@ -61,7 +68,7 @@ namespace jorts.Utils {
             "COCOA",
             "SILVER",
             "SLATE"};
-        return allthemes[Random.int_range (0,(allthemes.length - 1))];
+        return allthemes;
     }
 
 }