From a94666a8d60d6218be90935e031f7f1d89579d19 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Mon, 8 Jan 2024 11:49:02 -0500
Subject: [PATCH] More style refactoring for tiled collections.

---
 .../com/andrewlalis/perfin/PerfinApp.java     |  3 +++
 .../perfin/view/ProfilesStage.java            |  7 +++++-
 src/main/resources/account-view.fxml          |  4 ++--
 src/main/resources/accounts-view.fxml         |  8 +++----
 src/main/resources/main-view.fxml             |  1 -
 src/main/resources/profiles-view.fxml         | 23 ++++++++++++-------
 src/main/resources/style/base.css             | 17 +++++++++++++-
 .../resources/style/startup-splash-screen.css |  2 +-
 src/main/resources/transactions-view.fxml     |  4 ++--
 9 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/andrewlalis/perfin/PerfinApp.java b/src/main/java/com/andrewlalis/perfin/PerfinApp.java
index f7aa5cb..42e4d3f 100644
--- a/src/main/java/com/andrewlalis/perfin/PerfinApp.java
+++ b/src/main/java/com/andrewlalis/perfin/PerfinApp.java
@@ -61,6 +61,9 @@ public class PerfinApp extends Application {
         Platform.runLater(() -> {
             stage.hide();
             Scene mainViewScene = SceneUtil.load("/main-view.fxml");
+            mainViewScene.getStylesheets().addAll(
+                    PerfinApp.class.getResource("/style/base.css").toExternalForm()
+            );
             stage.setScene(mainViewScene);
             stage.setTitle("Perfin");
             stage.getIcons().add(ImageCache.getLogo64());
diff --git a/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java b/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java
index db102f0..cfd86c7 100644
--- a/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java
+++ b/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java
@@ -1,5 +1,6 @@
 package com.andrewlalis.perfin.view;
 
+import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.Window;
@@ -15,7 +16,11 @@ public class ProfilesStage extends Stage {
         setTitle("Profiles");
         setAlwaysOnTop(false);
         initModality(Modality.APPLICATION_MODAL);
-        setScene(SceneUtil.load("/profiles-view.fxml"));
+        Scene scene = SceneUtil.load("/profiles-view.fxml");
+        scene.getStylesheets().addAll(
+                ProfilesStage.class.getResource("/style/base.css").toExternalForm()
+        );
+        setScene(scene);
     }
 
     public static void open(Window owner) {
diff --git a/src/main/resources/account-view.fxml b/src/main/resources/account-view.fxml
index e193955..1529d47 100644
--- a/src/main/resources/account-view.fxml
+++ b/src/main/resources/account-view.fxml
@@ -63,8 +63,8 @@
             <VBox VBox.vgrow="ALWAYS">
                 <Label text="History" styleClass="bold-text,std-padding"/>
                 <VBox>
-                    <ScrollPane fitToHeight="true" fitToWidth="true">
-                        <VBox fx:id="historyItemsVBox" styleClass="padding-extra-1,spacing-extra-1"/>
+                    <ScrollPane styleClass="tile-container-scroll">
+                        <VBox fx:id="historyItemsVBox" styleClass="tile-container"/>
                     </ScrollPane>
                     <AnchorPane>
                         <Button
diff --git a/src/main/resources/accounts-view.fxml b/src/main/resources/accounts-view.fxml
index de60c96..3758d64 100644
--- a/src/main/resources/accounts-view.fxml
+++ b/src/main/resources/accounts-view.fxml
@@ -16,11 +16,11 @@
         </HBox>
     </top>
     <center>
-        <VBox>
-            <ScrollPane fitToHeight="true" fitToWidth="true" VBox.vgrow="ALWAYS">
-                <FlowPane fx:id="accountsPane" BorderPane.alignment="TOP_LEFT" vgap="10" hgap="10" styleClass="padding-extra-1"/>
+        <VBox BorderPane.alignment="TOP_LEFT">
+            <ScrollPane styleClass="tile-container-scroll" VBox.vgrow="ALWAYS">
+                <FlowPane fx:id="accountsPane" styleClass="tile-container"/>
             </ScrollPane>
-            <Label fx:id="noAccountsLabel" BorderPane.alignment="TOP_LEFT" styleClass="std-padding" text="No accounts have been added to this profile."/>
+            <Label fx:id="noAccountsLabel" styleClass="std-padding" text="No accounts have been added to this profile."/>
         </VBox>
     </center>
 </BorderPane>
diff --git a/src/main/resources/main-view.fxml b/src/main/resources/main-view.fxml
index bf6757f..07ed13b 100644
--- a/src/main/resources/main-view.fxml
+++ b/src/main/resources/main-view.fxml
@@ -7,7 +7,6 @@
         xmlns:fx="http://javafx.com/fxml"
         fx:id="mainContainer"
         fx:controller="com.andrewlalis.perfin.control.MainViewController"
-        stylesheets="@style/base.css"
 >
     <top>
         <VBox>
diff --git a/src/main/resources/profiles-view.fxml b/src/main/resources/profiles-view.fxml
index 1fdf4c3..a492a21 100644
--- a/src/main/resources/profiles-view.fxml
+++ b/src/main/resources/profiles-view.fxml
@@ -9,24 +9,31 @@
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             fx:controller="com.andrewlalis.perfin.control.ProfilesViewController"
-            stylesheets="@style/base.css"
             prefWidth="500"
             prefHeight="400"
 >
     <top>
-        <VBox styleClass="std-padding,std-spacing">
+        <VBox styleClass="padding-extra-1,std-spacing">
             <TextFlow>
-                <Text text="In Perfin, all your accounts, transactions, files, and other financial data are stored in a single "/>
-                <Text text="profile" styleClass="bold-text"/>
-                <Text text=". By default, Perfin uses the "/>
-                <Text text="default" style="-fx-font-style: italic;"/>
-                <Text text=" profile, and this should be sufficient for most users, but you can also add new profiles if you'd like to track some finances separately."/>
+                <Text>
+                    In Perfin, all your accounts, transactions, attachment files,
+                    and other financial data are stored in a single
+                </Text>
+                <Text styleClass="italic-text">&#160;profile</Text>
+                <Text>.</Text>
+            </TextFlow>
+            <TextFlow>
+                <Text>
+                    Usually, a single profile will be sufficient for most users,
+                    but you can add new profiles if you'd like to track certain
+                    finances separately.
+                </Text>
             </TextFlow>
         </VBox>
     </top>
     <center>
         <ScrollPane fitToWidth="true" fitToHeight="true">
-            <VBox fx:id="profilesVBox" styleClass="std-padding,spacing-extra"/>
+            <VBox fx:id="profilesVBox" styleClass="tile-container"/>
         </ScrollPane>
     </center>
     <bottom>
diff --git a/src/main/resources/style/base.css b/src/main/resources/style/base.css
index 0ab999d..78fad57 100644
--- a/src/main/resources/style/base.css
+++ b/src/main/resources/style/base.css
@@ -23,10 +23,14 @@ rather than with your own CSS.
     -fx-font-family: "Roboto", sans-serif;
     -fx-font-size: 14px;
     -fx-text-fill: -fx-theme-text;
-    -fx-fill: -fx-theme-text;
     -fx-background-color: -fx-theme-background;
 }
 
+Text {
+    -fx-fill: -fx-theme-text;
+}
+
+/* Font/text styles */
 .mono-font {
     -fx-font-family: "JetBrains Mono", monospace;
 }
@@ -86,6 +90,17 @@ rather than with your own CSS.
 }
 
 /* Standard "tile" styling. */
+.tile-container {
+    -fx-padding: 10px;
+    -fx-spacing: 10px;
+    -fx-hgap: 10px;
+    -fx-vgap: 10px;
+}
+.tile-container-scroll {
+    -fx-fit-to-height: true;
+    -fx-fit-to-width: true;
+}
+
 .tile {
     -fx-background-color: -fx-theme-background-2;
     -fx-padding: 10px;
diff --git a/src/main/resources/style/startup-splash-screen.css b/src/main/resources/style/startup-splash-screen.css
index 8d98491..650ad58 100644
--- a/src/main/resources/style/startup-splash-screen.css
+++ b/src/main/resources/style/startup-splash-screen.css
@@ -13,7 +13,7 @@
     -fx-background-color: transparent;
     -fx-border-style: none;
     -fx-border-color: transparent;
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-theme-background;
     -fx-padding: 0;
 }
 
diff --git a/src/main/resources/transactions-view.fxml b/src/main/resources/transactions-view.fxml
index 050d43e..6bfd36b 100644
--- a/src/main/resources/transactions-view.fxml
+++ b/src/main/resources/transactions-view.fxml
@@ -27,8 +27,8 @@
                     </HBox>
                 </top>
                 <center>
-                    <ScrollPane fitToHeight="true" fitToWidth="true">
-                        <VBox fx:id="transactionsVBox" styleClass="padding-extra-1,spacing-extra-1"/>
+                    <ScrollPane styleClass="tile-container-scroll">
+                        <VBox fx:id="transactionsVBox" styleClass="tile-container"/>
                     </ScrollPane>
                 </center>
             </BorderPane>