Merge remote-tracking branch 'origin/master'

README.md

@@ -23,7 +23,7 @@ Maven dependency
         <dependency>
             <groupId>com.github.leewyatt</groupId>
             <artifactId>rxcontrols</artifactId>
-            <version>11.0.0-alpha</version>
+            <version>8.0.0-alpha</version>
         </dependency>
     </dependencies>
 ```

pom.xml

@@ -6,36 +6,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.target>8</maven.compiler.target>
     </properties>
     <groupId>com.github.leewyatt</groupId>
     <artifactId>rxcontrols</artifactId>
-    <version>11.0.0-alpha</version>
+    <version>8.0.0-alpha</version>
     <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>11</version>
-        </dependency>
-        <!--  test files use fxml -->
-        <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>11</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!--  test files use webview -->
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-web</artifactId>
-            <version>11</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
     <build>
         <plugins>
@@ -45,34 +22,11 @@
                 <version>3.8.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>11</source>
+                    <source>8</source>
-                    <target>11</target>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <!--    <build>-->
-    <!--        <resources>-->
-    <!--            <resource>-->
-    <!--                <directory>src/main/resources</directory>-->
-    <!--                <includes>-->
-    <!--                    <include>**/*</include>-->
-    <!--                </includes>-->
-    <!--                <filtering>false</filtering>-->
-    <!--            </resource>-->
-    <!--        </resources>-->
-    <!--        <plugins>-->
-    <!--            <plugin>-->
-    <!--                <groupId>org.apache.maven.plugins</groupId>-->
-    <!--                <artifactId>maven-compiler-plugin</artifactId>-->
-    <!--                <version>3.8.1</version>-->
-    <!--                <configuration>-->
-    <!--                    <source>11</source>-->
-    <!--                    <target>11</target>-->
-    <!--                </configuration>-->
-    <!--            </plugin>-->
-    <!--        </plugins>-->
-    <!--    </build>-->
-
 </project>

src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java

@@ -26,6 +26,9 @@ package com.leewyatt.rxcontrols.controls;
 
 import com.leewyatt.rxcontrols.skins.RXAudioSpectrumSkin;
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EffectConverter;
+import com.sun.javafx.css.converters.EnumConverter;
+import com.sun.javafx.css.converters.ShapeConverter;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -35,9 +38,6 @@ import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
-import javafx.css.converter.EffectConverter;
-import javafx.css.converter.EnumConverter;
-import javafx.css.converter.ShapeConverter;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.effect.Effect;

src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java

@@ -24,8 +24,9 @@
  */
 package com.leewyatt.rxcontrols.controls;
 
-import com.leewyatt.rxcontrols.utils.RXResources;
 import com.leewyatt.rxcontrols.skins.RXAvatarSkin;
+import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -33,7 +34,6 @@ import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
-import javafx.css.converter.EnumConverter;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;

src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java

@@ -24,10 +24,10 @@
  */
 package com.leewyatt.rxcontrols.controls;
 
+import com.sun.javafx.css.converters.DurationConverter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.css.*;
-import javafx.css.converter.DurationConverter;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.Node;

src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java

@@ -29,13 +29,13 @@ import com.leewyatt.rxcontrols.animation.carousel.CarouselAnimation;
 import com.leewyatt.rxcontrols.enums.DisplayMode;
 import com.leewyatt.rxcontrols.pane.RXCarouselPane;
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.BooleanConverter;
+import com.sun.javafx.css.converters.DurationConverter;
+import com.sun.javafx.css.converters.EnumConverter;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.*;
-import javafx.css.converter.BooleanConverter;
-import javafx.css.converter.DurationConverter;
-import javafx.css.converter.EnumConverter;
 import javafx.scene.SubScene;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;

src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java

@@ -25,14 +25,14 @@
 package com.leewyatt.rxcontrols.controls;
 
 import com.leewyatt.rxcontrols.skins.RXDigitSkin;
-// import com.sun.javafx.css.converters.PaintConverter;
+import com.sun.javafx.css.converters.PaintConverter;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.css.*;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
-import javafx.css.converter.PaintConverter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java

@@ -24,15 +24,15 @@
  */
 package com.leewyatt.rxcontrols.controls;
 
+import com.leewyatt.rxcontrols.animation.fillbutton.*;
 import com.leewyatt.rxcontrols.skins.RXFillButtonSkin;
 import com.leewyatt.rxcontrols.utils.RXResources;
-import com.leewyatt.rxcontrols.animation.fillbutton.*;
+import com.sun.javafx.css.converters.EnumConverter;
+import com.sun.javafx.css.converters.PaintConverter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.css.*;
-import javafx.css.converter.EnumConverter;
-import javafx.css.converter.PaintConverter;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Skin;

src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java

@@ -25,10 +25,10 @@
 package com.leewyatt.rxcontrols.controls;
 
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
+import com.sun.javafx.css.converters.SizeConverter;
 import javafx.beans.property.*;
 import javafx.css.*;
-import javafx.css.converter.EnumConverter;
-import javafx.css.converter.SizeConverter;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.text.TextAlignment;

src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java

@@ -29,12 +29,12 @@ import com.leewyatt.rxcontrols.animation.lineButton.LineAnimRise;
 import com.leewyatt.rxcontrols.animation.lineButton.LineAnimation;
 import com.leewyatt.rxcontrols.skins.RXLineButtonSkin;
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.css.*;
-import javafx.css.converter.EnumConverter;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Skin;

src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java

@@ -27,15 +27,15 @@ package com.leewyatt.rxcontrols.controls;
 import com.leewyatt.rxcontrols.pojo.LrcDoc;
 import com.leewyatt.rxcontrols.skins.RXLrcViewSkin;
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.DurationConverter;
+import com.sun.javafx.css.converters.SizeConverter;
+import com.sun.javafx.css.converters.StringConverter;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.WritableValue;
 import javafx.css.*;
-import javafx.css.converter.DurationConverter;
-import javafx.css.converter.SizeConverter;
-import javafx.css.converter.StringConverter;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.util.Duration;

src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java

@@ -25,13 +25,13 @@
 package com.leewyatt.rxcontrols.controls;
 
 import com.leewyatt.rxcontrols.enums.DisplayMode;
-import com.leewyatt.rxcontrols.utils.RXResources;
 import com.leewyatt.rxcontrols.skins.RXPasswordFieldSkin;
+import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
+import com.sun.javafx.css.converters.StringConverter;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.css.*;
-import javafx.css.converter.EnumConverter;
-import javafx.css.converter.StringConverter;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
 import javafx.scene.control.PasswordField;

src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java

@@ -28,13 +28,13 @@ import com.leewyatt.rxcontrols.enums.DisplayMode;
 import com.leewyatt.rxcontrols.event.RXActionEvent;
 import com.leewyatt.rxcontrols.skins.RXTextFieldSkin;
 import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
-import javafx.css.converter.EnumConverter;
 import javafx.event.EventHandler;
 import javafx.scene.control.Skin;
 import javafx.scene.control.TextField;

src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java

@@ -24,13 +24,13 @@
  */
 package com.leewyatt.rxcontrols.controls;
 
-import com.leewyatt.rxcontrols.utils.RXResources;
 import com.leewyatt.rxcontrols.skins.RXTranslationButtonSkin;
+import com.leewyatt.rxcontrols.utils.RXResources;
+import com.sun.javafx.css.converters.EnumConverter;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
-import javafx.css.converter.EnumConverter;
 import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 

src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java

@@ -25,12 +25,12 @@
 package com.leewyatt.rxcontrols.skins;
 
 import com.leewyatt.rxcontrols.controls.RXPagination;
+import com.sun.javafx.scene.control.skin.PaginationSkin;
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.Pagination;
 import javafx.scene.control.TextField;
-import javafx.scene.control.skin.PaginationSkin;
 import javafx.scene.layout.HBox;
 
 /**

src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java

@@ -26,13 +26,13 @@ package com.leewyatt.rxcontrols.skins;
 
 import com.leewyatt.rxcontrols.controls.RXPasswordField;
 import com.leewyatt.rxcontrols.enums.DisplayMode;
+import com.sun.javafx.scene.control.skin.TextFieldSkin;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.css.SimpleStyleableStringProperty;
 import javafx.scene.Cursor;
 import javafx.scene.control.TextField;
-import javafx.scene.control.skin.TextFieldSkin;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;

src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java

@@ -27,9 +27,9 @@ package com.leewyatt.rxcontrols.skins;
 import com.leewyatt.rxcontrols.controls.RXTextField;
 import com.leewyatt.rxcontrols.enums.DisplayMode;
 import com.leewyatt.rxcontrols.event.RXActionEvent;
+import com.sun.javafx.scene.control.skin.TextFieldSkin;
 import javafx.beans.value.ChangeListener;
 import javafx.scene.Cursor;
-import javafx.scene.control.skin.TextFieldSkin;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;

src/main/java/module-info.java

@@ -1,39 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2021 LeeWyatt
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-module rxcontrols {
-    requires javafx.controls;
-    requires java.xml;
-
-    exports com.leewyatt.rxcontrols.animation.carousel;
-    exports com.leewyatt.rxcontrols.animation.fillbutton;
-    exports com.leewyatt.rxcontrols.animation.lineButton;
-    exports com.leewyatt.rxcontrols.controls;
-    exports com.leewyatt.rxcontrols.enums;
-    exports com.leewyatt.rxcontrols.event;
-    exports com.leewyatt.rxcontrols.pane;
-    exports com.leewyatt.rxcontrols.pojo;
-    exports com.leewyatt.rxcontrols.skins;
-    exports com.leewyatt.rxcontrols.utils;
-}

src/test/resources/fxml/main.fxml

@@ -18,7 +18,7 @@
 <?import javafx.scene.shape.SVGPath?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="618.0" prefWidth="1017.0" style="-fx-background-color: #0000;" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.MainController">
+<AnchorPane prefHeight="618.0" prefWidth="1017.0" style="-fx-background-color: #0000;" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.MainController">
    <children>
       <BorderPane layoutX="9.0" layoutY="9.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="998.0" styleClass="root-pane" stylesheets="@../css/main.css">
          <left>

src/test/resources/fxml/pane_about.fxml

@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="511.0" prefWidth="761.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.PaneAboutController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="511.0" prefWidth="761.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.PaneAboutController">
    <children>
       <AnchorPane layoutX="91.0" layoutY="131.0" prefHeight="320.0" prefWidth="586.0" style="-fx-background-color: #f1f1f1; -fx-background-radius: 15;" AnchorPane.leftAnchor="85.0" AnchorPane.topAnchor="90.0">
          <children>

src/test/resources/fxml/pane_media.fxml

@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="511.0" prefWidth="761.0" style="-fx-background-color: white;" stylesheets="@../css/pane_media.css" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.PaneMediaController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="511.0" prefWidth="761.0" style="-fx-background-color: white;" stylesheets="@../css/pane_media.css" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.controller.PaneMediaController">
    <children>
       <RXTranslationButton id="open-btn" layoutX="23.0" layoutY="17.0" onAction="#openFileAction" prefHeight="36.0" prefWidth="186.0" text="Open Mp3 File">
          <graphic>