Merge branch 'master' of git@github.com:XDean/CSS-Editor-FX

Author: XDean

pom.xml

@@ -15,6 +15,16 @@
     <mainClass>xdean.css.editor.CSSMain</mainClass>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.reactivex.rxjava2</groupId>
+        <artifactId>rxjava</artifactId>
+        <version>2.1.13</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>com.github.XDean</groupId>

src/main/java/xdean/css/editor/FxCssApplication.java

@@ -9,7 +9,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.controlsfx.glyphfont.Glyph;
 import org.springframework.stereotype.Component;
 
 import javafx.beans.property.ObjectProperty;
@@ -59,9 +58,6 @@ public FxCssApplication(@Named(FxContext.FX_PRIMARY_STAGE) Stage stage) {
 
   @Override
   public void start(Stage stage) throws Exception {
-    // To ensure font awesome loaded
-    new Glyph().setFontFamily("FontAwesome");
-    
     Scene scene = skinService.bind(new Scene(mainFrame.getRoot()));
     scene.getStylesheets().add("/css/global.css");
     stage.setScene(scene);

src/main/java/xdean/css/editor/FxCssEntrance.java

@@ -1,13 +1,12 @@
 package xdean.css.editor;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.context.annotation.Import;
 
-import xdean.css.editor.context.Context;
+import xdean.jfx.spring.annotation.Splash;
 import xdean.jfx.spring.annotation.SpringFxApplication;
 
+@Splash
 @SpringFxApplication
-@Import(Context.class)
 public class FxCssEntrance {
   public static void main(String[] args) {
     SpringApplication.run(FxCssEntrance.class, args);

src/main/java/xdean/css/editor/context/Config.java

@@ -8,11 +8,16 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
 import org.springframework.stereotype.Service;
 
 import io.reactivex.subjects.Subject;
 import io.reactivex.subjects.UnicastSubject;
 import xdean.jex.log.Logable;
+import xdean.jfx.spring.splash.PreloadReporter;
+import xdean.jfx.spring.splash.PreloadReporter.SubReporter;
 
 @Service
 public class Config implements Logable {
@@ -21,18 +26,25 @@ public class Config implements Logable {
 
   private final Properties properties = new Properties();
   private final Subject<String> saveSubject = UnicastSubject.create();
+  private @Inject PreloadReporter preload;
 
-  public Config() {
+  @PostConstruct
+  public void init() {
     try {
+      SubReporter sub = preload.load("Loading settings...");
+      sub.setCount(3);
+      sub.load("Check user setting");
       if (Files.notExists(CONFIG_FILE)) {
         if (Files.exists(DEFAULT_CONFIG_PATH)) {
           Files.copy(DEFAULT_CONFIG_PATH, CONFIG_FILE);
         } else {
           Files.createFile(CONFIG_FILE);
         }
       }
+      sub.load("Loading settings file");
       properties.load(Files.newBufferedReader(CONFIG_FILE));
       debug("Load last config: " + properties.toString());
+      sub.load("Apply settings");
       saveSubject
           .debounce(1000, TimeUnit.MILLISECONDS)
           .subscribe(e -> saveToFile());

src/main/java/xdean/css/editor/context/Context.java

@@ -7,7 +7,9 @@
 
 import javax.inject.Inject;
 
-import org.springframework.boot.context.event.ApplicationStartingEvent;
+import org.controlsfx.glyphfont.FontAwesome;
+import org.controlsfx.glyphfont.GlyphFontRegistry;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,7 +25,7 @@
 
 @Configuration
 @AutoSpringFactories(ApplicationListener.class)
-public class Context implements FxContextPostProcessor, ApplicationListener<ApplicationStartingEvent>,
+public class Context implements FxContextPostProcessor, ApplicationListener<ApplicationPreparedEvent>,
     UncaughtExceptionHandler, Logable {
   public static final Path HOME_PATH = Paths.get(System.getProperty("user.home"), ".xdean", "css");
   public static final Path TEMP_PATH = HOME_PATH.resolve("temp");
@@ -32,7 +34,7 @@ public class Context implements FxContextPostProcessor, ApplicationListener<Appl
   private @Inject DialogService messageService;
 
   @Override
-  public void onApplicationEvent(ApplicationStartingEvent event) {
+  public void onApplicationEvent(ApplicationPreparedEvent event) {
     debug("Setup Css Editor Environment");
     // create directories
     try {
@@ -43,6 +45,10 @@ public void onApplicationEvent(ApplicationStartingEvent event) {
     }
     // close CSS logger
     Logging.getCSSLogger().setLevel(Level.OFF);
+
+    // To ensure font awesome loaded
+    GlyphFontRegistry.register(new FontAwesome(getClass().getResourceAsStream("/fontawesome.ttf")));
+    GlyphFontRegistry.font("FontAwesome");
   }
 
   @Override

src/main/java/xdean/css/editor/service/SkinService.java

@@ -17,6 +17,8 @@
 import xdean.jex.log.Logable;
 import xdean.jex.util.string.StringUtil;
 import xdean.jfx.spring.annotation.FxReady;
+import xdean.jfx.spring.splash.PreloadReporter;
+import xdean.jfx.spring.splash.PreloadReporter.SubReporter;
 import xdean.jfxex.support.skin.SkinManager;
 import xdean.jfxex.support.skin.SkinStyle;
 
@@ -30,10 +32,15 @@ public class SkinService extends SkinManager implements Logable {
   @Inject
   private DialogService dialogService;
 
+  @Inject
+  private PreloadReporter preload;
+
   @PostConstruct
   public void init() throws Exception {
+    SubReporter sub = preload.load("Loading skins...");
     // load default skins
     for (SkinStyle ss : DefaultSkin.values()) {
+      sub.load("Loading " + ss.getName());
       addSkin(ss);
     }
     // load skin files in /skin
@@ -47,6 +54,7 @@ public void init() throws Exception {
           if (!Files.isDirectory(path) && (fileName.endsWith(".css") || fileName.endsWith(".bss"))) {
             String url = path.toUri().toString();
             String name = StringUtil.upperFirst(fileName.substring(0, fileName.length() - 4));
+            sub.load("Loading " + name);
             addSkin(new SkinStyle() {
               @Override
               public String getURL() {
@@ -69,6 +77,7 @@ public String getName() {
     }
     getSkinList().stream().map(SkinStyle::getURL).map(s -> "loaded skin: " + s).forEach(this::debug);
 
+    sub.load("Read skin setting");
     String configSkin = skinOption.getValue();
     if (configSkin != null) {
       getSkinList().stream()
@@ -78,6 +87,7 @@ public String getName() {
     } else {
       changeSkin(DefaultSkin.CLASSIC);
     }
+    sub.load("Apply skin setting");
     JavaFxObservable.valuesOf(skinProperty())
         .subscribe(skin -> skinOption.setValue(skin.getName()));
   }