From d864160b32294b72a4f6cea7364e6a159bee359f Mon Sep 17 00:00:00 2001 From: RubbaBoy Date: Wed, 15 May 2019 01:09:11 -0400 Subject: [PATCH] Updated to Java 12 (Kinda) --- README.md | 24 +- build.gradle | 28 +- demo/build.gradle | 19 - demo/src/main/java/demos/MainDemo.java | 71 - .../main/java/demos/components/AlertDemo.java | 55 - .../java/demos/components/AnimationDemo.java | 182 --- .../java/demos/components/ButtonDemo.java | 48 - .../java/demos/components/CheckBoxDemo.java | 50 - .../java/demos/components/ChipViewDemo.java | 36 - .../demos/components/ColorPickerDemo.java | 46 - .../java/demos/components/ComboBoxDemo.java | 52 - .../java/demos/components/DatePickerDemo.java | 80 -- .../java/demos/components/DrawerDemo.java | 108 -- .../java/demos/components/HamburgerDemo.java | 84 -- .../java/demos/components/ListViewDemo.java | 83 -- .../java/demos/components/NodesListDemo.java | 155 -- .../main/java/demos/components/PopupDemo.java | 57 - .../demos/components/ProgressBarDemo.java | 76 - .../demos/components/RadioButtonDemo.java | 50 - .../java/demos/components/RipplerDemo.java | 96 -- .../java/demos/components/ScrollPaneDemo.java | 68 - .../java/demos/components/SliderDemo.java | 62 - .../java/demos/components/SpinnerDemo.java | 31 - .../main/java/demos/components/TabsDemo.java | 80 -- .../java/demos/components/TextAreaDemo.java | 67 - .../java/demos/components/TextFieldDemo.java | 96 -- .../demos/components/ToggleButtonDemo.java | 57 - .../java/demos/components/ToolBarDemo.java | 31 - .../java/demos/components/TreeTableDemo.java | 167 --- .../java/demos/components/TreeViewDemo.java | 202 --- .../java/demos/components/base/Overdrive.java | 76 - .../datafx/ExtendedAnimatedFlowContainer.java | 134 -- .../java/demos/gui/main/MainController.java | 126 -- .../gui/sidemenu/SideMenuController.java | 143 -- .../gui/uicomponents/ButtonController.java | 8 - .../gui/uicomponents/CheckboxController.java | 8 - .../gui/uicomponents/ChipViewController.java | 93 -- .../gui/uicomponents/ComboBoxController.java | 51 - .../gui/uicomponents/DialogController.java | 97 -- .../uicomponents/HighlighterController.java | 41 - .../gui/uicomponents/IconsController.java | 96 -- .../gui/uicomponents/ListViewController.java | 46 - .../uicomponents/MasonryPaneController.java | 156 -- .../gui/uicomponents/NodesListController.java | 47 - .../gui/uicomponents/PickersController.java | 26 - .../gui/uicomponents/PopupController.java | 57 - .../uicomponents/ProgressBarController.java | 43 - .../uicomponents/RadioButtonController.java | 8 - .../gui/uicomponents/SVGLoaderController.java | 277 ---- .../uicomponents/ScrollPaneController.java | 49 - .../gui/uicomponents/SliderController.java | 8 - .../gui/uicomponents/SpinnerController.java | 44 - .../gui/uicomponents/TextFieldController.java | 43 - .../uicomponents/ToggleButtonController.java | 8 - .../uicomponents/TreeTableViewController.java | 215 --- demo/src/main/java/module-info.java | 32 - demo/src/main/resources/bg1.jpg | Bin 56901 -> 0 bytes demo/src/main/resources/bg4.jpg | Bin 83554 -> 0 bytes .../main/resources/css/jfoenix-components.css | 343 ----- .../main/resources/css/jfoenix-main-demo.css | 1074 -------------- demo/src/main/resources/fonts/icomoon.svg | 1280 ----------------- demo/src/main/resources/fxml/Main.fxml | 47 - demo/src/main/resources/fxml/SideMenu.fxml | 34 - demo/src/main/resources/fxml/ui/Button.fxml | 36 - demo/src/main/resources/fxml/ui/Checkbox.fxml | 35 - demo/src/main/resources/fxml/ui/ChipView.fxml | 12 - demo/src/main/resources/fxml/ui/Combobox.fxml | 139 -- demo/src/main/resources/fxml/ui/Dialog.fxml | 63 - .../main/resources/fxml/ui/Highlighter.fxml | 35 - demo/src/main/resources/fxml/ui/Icons.fxml | 67 - demo/src/main/resources/fxml/ui/ListView.fxml | 96 -- demo/src/main/resources/fxml/ui/Masonry.fxml | 15 - .../src/main/resources/fxml/ui/NodesList.fxml | 42 - demo/src/main/resources/fxml/ui/Pickers.fxml | 32 - demo/src/main/resources/fxml/ui/Popup.fxml | 32 - .../main/resources/fxml/ui/ProgressBar.fxml | 25 - .../main/resources/fxml/ui/RadioButton.fxml | 54 - .../src/main/resources/fxml/ui/SVGLoader.fxml | 26 - .../main/resources/fxml/ui/ScrollPane.fxml | 49 - demo/src/main/resources/fxml/ui/Slider.fxml | 31 - demo/src/main/resources/fxml/ui/Spinner.fxml | 32 - .../src/main/resources/fxml/ui/TextField.fxml | 42 - .../main/resources/fxml/ui/ToggleButton.fxml | 45 - .../main/resources/fxml/ui/TreeTableView.fxml | 54 - .../resources/fxml/ui/popup/DemoPopup.fxml | 54 - .../resources/fxml/ui/popup/MainPopup.fxml | 27 - gradle/javafx.gradle | 22 +- gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 10 +- jfoenix/build.gradle | 5 +- .../com/jfoenix/controls/JFXColorPicker.java | 2 +- .../java/com/jfoenix/controls/JFXTooltip.java | 16 +- .../com/jfoenix/skins/JFXTextFieldSkin.java | 4 +- jfoenix/src/main/java/module-info.java | 12 +- settings.gradle | 4 +- 95 files changed, 80 insertions(+), 8009 deletions(-) delete mode 100644 demo/build.gradle delete mode 100644 demo/src/main/java/demos/MainDemo.java delete mode 100644 demo/src/main/java/demos/components/AlertDemo.java delete mode 100644 demo/src/main/java/demos/components/AnimationDemo.java delete mode 100644 demo/src/main/java/demos/components/ButtonDemo.java delete mode 100644 demo/src/main/java/demos/components/CheckBoxDemo.java delete mode 100644 demo/src/main/java/demos/components/ChipViewDemo.java delete mode 100644 demo/src/main/java/demos/components/ColorPickerDemo.java delete mode 100644 demo/src/main/java/demos/components/ComboBoxDemo.java delete mode 100644 demo/src/main/java/demos/components/DatePickerDemo.java delete mode 100644 demo/src/main/java/demos/components/DrawerDemo.java delete mode 100644 demo/src/main/java/demos/components/HamburgerDemo.java delete mode 100644 demo/src/main/java/demos/components/ListViewDemo.java delete mode 100644 demo/src/main/java/demos/components/NodesListDemo.java delete mode 100644 demo/src/main/java/demos/components/PopupDemo.java delete mode 100644 demo/src/main/java/demos/components/ProgressBarDemo.java delete mode 100644 demo/src/main/java/demos/components/RadioButtonDemo.java delete mode 100644 demo/src/main/java/demos/components/RipplerDemo.java delete mode 100644 demo/src/main/java/demos/components/ScrollPaneDemo.java delete mode 100644 demo/src/main/java/demos/components/SliderDemo.java delete mode 100644 demo/src/main/java/demos/components/SpinnerDemo.java delete mode 100644 demo/src/main/java/demos/components/TabsDemo.java delete mode 100644 demo/src/main/java/demos/components/TextAreaDemo.java delete mode 100644 demo/src/main/java/demos/components/TextFieldDemo.java delete mode 100644 demo/src/main/java/demos/components/ToggleButtonDemo.java delete mode 100644 demo/src/main/java/demos/components/ToolBarDemo.java delete mode 100644 demo/src/main/java/demos/components/TreeTableDemo.java delete mode 100644 demo/src/main/java/demos/components/TreeViewDemo.java delete mode 100644 demo/src/main/java/demos/components/base/Overdrive.java delete mode 100644 demo/src/main/java/demos/datafx/ExtendedAnimatedFlowContainer.java delete mode 100644 demo/src/main/java/demos/gui/main/MainController.java delete mode 100644 demo/src/main/java/demos/gui/sidemenu/SideMenuController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ButtonController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/CheckboxController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ChipViewController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ComboBoxController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/DialogController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/HighlighterController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/IconsController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ListViewController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/MasonryPaneController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/NodesListController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/PickersController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/PopupController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ProgressBarController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/RadioButtonController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/SVGLoaderController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ScrollPaneController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/SliderController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/SpinnerController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/TextFieldController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/ToggleButtonController.java delete mode 100644 demo/src/main/java/demos/gui/uicomponents/TreeTableViewController.java delete mode 100644 demo/src/main/java/module-info.java delete mode 100644 demo/src/main/resources/bg1.jpg delete mode 100644 demo/src/main/resources/bg4.jpg delete mode 100644 demo/src/main/resources/css/jfoenix-components.css delete mode 100644 demo/src/main/resources/css/jfoenix-main-demo.css delete mode 100644 demo/src/main/resources/fonts/icomoon.svg delete mode 100644 demo/src/main/resources/fxml/Main.fxml delete mode 100644 demo/src/main/resources/fxml/SideMenu.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Button.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Checkbox.fxml delete mode 100644 demo/src/main/resources/fxml/ui/ChipView.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Combobox.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Dialog.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Highlighter.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Icons.fxml delete mode 100644 demo/src/main/resources/fxml/ui/ListView.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Masonry.fxml delete mode 100644 demo/src/main/resources/fxml/ui/NodesList.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Pickers.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Popup.fxml delete mode 100644 demo/src/main/resources/fxml/ui/ProgressBar.fxml delete mode 100644 demo/src/main/resources/fxml/ui/RadioButton.fxml delete mode 100644 demo/src/main/resources/fxml/ui/SVGLoader.fxml delete mode 100644 demo/src/main/resources/fxml/ui/ScrollPane.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Slider.fxml delete mode 100644 demo/src/main/resources/fxml/ui/Spinner.fxml delete mode 100644 demo/src/main/resources/fxml/ui/TextField.fxml delete mode 100644 demo/src/main/resources/fxml/ui/ToggleButton.fxml delete mode 100644 demo/src/main/resources/fxml/ui/TreeTableView.fxml delete mode 100644 demo/src/main/resources/fxml/ui/popup/DemoPopup.fxml delete mode 100644 demo/src/main/resources/fxml/ui/popup/MainPopup.fxml diff --git a/README.md b/README.md index 6fad38b8..ef96fac8 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ * JFoenix for Android - [download jar](https://search.maven.org/remotecontent?filepath=com/jfoenix/jfoenix/8.0.8/jfoenix-8.0.8-retrolambda.jar) * Released builds are available from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7CJFoenix) +# Note on the fork +This fork was made to allow Java 12, and the current master goes off of the [JFoenix-9.0.0](https://github.com/jfoenixadmin/JFoenix/tree/JFoenix-9.0.0) branch of JFoenix. This is messy and there's better ways to do almost everything changed, but it works and I couldn't give two shits. This _will_ disbanded if JFoenix natively supports Java 12, though it seems like they won't, at least for the next few years. + +Honestly, there's probably going to be shit broken with it and you can make a PR or something to fix it, since this is actively being used in a project. + # Using JFoenix already? Feel free to submit your project info to the following email, to be posted on JFoenix github. * One more thing, all contributions are appreciated. Don't hesitate to add your own contributions to JFoenix :) @@ -59,13 +64,11 @@ If you like JFoenix :) and want to support this project, you can become a backer # Build -To build JFoenix, execute the following command: +To build JFoenix with Java 12, I usually run the following command: - gradlew build + clean build install -x myJavadocs -To run the main demo, execute the following command: - - gradlew run +There's probably a better way to do this, but this keeps it local and it works. **NOTE** : You need to set JAVA_HOME environment variable to point to Java 1.8 directory. @@ -87,8 +90,7 @@ repositories { Reference the repository from this location using: ``` dependencies { - compile 'com.jfoenix:jfoenix:8.0.8' // Java 8 - compile 'com.jfoenix:jfoenix:9.0.8' // Java 9 + compile 'com.jfoenix:jfoenix:9.0.8-J12' // Java 12 } ``` @@ -98,13 +100,7 @@ dependencies { com.jfoenix jfoenix - 9.0.8 - - - - com.jfoenix - jfoenix - 8.0.8 + 9.0.8-J12 ``` # Components diff --git a/build.gradle b/build.gradle index 86aaf48f..d8d2a535 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ buildscript { mavenCentral() } } - plugins { id 'com.jfrog.bintray' version '1.7.3' apply false id 'com.github.ben-manes.versions' version '0.15.0' apply false @@ -12,13 +11,19 @@ plugins { id 'com.github.hierynomus.license' version '0.14.0' apply false id 'net.nemerosa.versioning' version '2.6.1' apply false id 'org.sonarqube' version '2.5' + id 'org.openjfx.javafxplugin' version '0.0.6' apply false + id 'maven' } +project.version = '9.0.8-J12' + subprojects { afterEvaluate { apply plugin: 'java' apply plugin: 'com.github.ben-manes.versions' apply plugin: 'net.nemerosa.versioning' + apply plugin: 'org.openjfx.javafxplugin' + apply plugin: 'maven' // end::autoModuleName[] repositories { @@ -27,13 +32,28 @@ subprojects { maven { url 'http://sevntu-checkstyle.github.com/sevntu.checkstyle/maven2' } } - sourceCompatibility = 1.9 - targetCompatibility = 1.9 + sourceCompatibility = 12 + targetCompatibility = 12 + + project.version = '9.0.8-J12' tasks.withType(JavaCompile) { options.incremental = true } + configurations { + javafxCompile + } + + dependencies { + javafxCompile "org.openjfx:javafx-base:12.0.1:win" + javafxCompile "org.openjfx:javafx-graphics:12.0.1:win" + javafxCompile "org.openjfx:javafx-controls:12.0.1:win" + javafxCompile "org.openjfx:javafx-fxml:12.0.1:win" + + compile configurations.javafxCompile + } + // tag::autoModuleName[] jar { inputs.property("moduleName", moduleName) @@ -65,6 +85,8 @@ subprojects { "--add-exports=javafx.graphics/com.sun.javafx.stage=com.jfoenix", "--add-exports=javafx.graphics/com.sun.javafx.util=com.jfoenix", "--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=com.jfoenix", + "--add-exports=javafx.graphics/jabafx=com.jfoenix", + "--add-exports=javafx.controls/javafx.scene.control.skin=com.jfoenix", // For various behaviors across controls "--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix", diff --git a/demo/build.gradle b/demo/build.gradle deleted file mode 100644 index 138ea5c2..00000000 --- a/demo/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'application' -apply plugin: 'java-library' - -applicationDefaultJvmArgs = ["-Dprism.order=d3d,es2,es1,sw "] -mainClassName = 'demos.MainDemo' - -ext.moduleName = 'demo.main' - -dependencies { - // NOTE: the latest version _is_ 8.0.1! - // 8.0.7 was published by mistake - compile 'io.datafx:datafx:8.0.1' - compile 'io.datafx:flow:8.0.1' - - // FontAwesome (Bintray) - compile 'de.jensd:fontawesomefx-fontawesome:4.7.0-9' - - compile project(':jfoenix') -} diff --git a/demo/src/main/java/demos/MainDemo.java b/demo/src/main/java/demos/MainDemo.java deleted file mode 100644 index f7c2512a..00000000 --- a/demo/src/main/java/demos/MainDemo.java +++ /dev/null @@ -1,71 +0,0 @@ -package demos; - -import com.jfoenix.assets.JFoenixResources; -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXDecorator; -import com.jfoenix.svg.SVGGlyph; -import com.jfoenix.svg.SVGGlyphLoader; -import demos.gui.main.MainController; -import io.datafx.controller.flow.Flow; -import io.datafx.controller.flow.container.DefaultFlowContainer; -import io.datafx.controller.flow.context.FXMLViewFlowContext; -import io.datafx.controller.flow.context.ViewFlowContext; -import javafx.application.Application; -import javafx.collections.ObservableList; -import javafx.geometry.Rectangle2D; -import javafx.scene.Scene; -import javafx.stage.Screen; -import javafx.stage.Stage; - -import java.io.IOException; - -public class MainDemo extends Application { - - @FXMLViewFlowContext - private ViewFlowContext flowContext; - - public static void main(String[] args) { - launch(args); - } - - @Override - public void start(Stage stage) throws Exception { - new Thread(() -> { - try { - SVGGlyphLoader.loadGlyphsFont(MainDemo.class.getResourceAsStream("/fonts/icomoon.svg"), - "icomoon.svg"); - } catch (IOException ioExc) { - ioExc.printStackTrace(); - } - }).start(); - - Flow flow = new Flow(MainController.class); - DefaultFlowContainer container = new DefaultFlowContainer(); - flowContext = new ViewFlowContext(); - flowContext.register("Stage", stage); - flow.createHandler(flowContext).start(container); - - JFXDecorator decorator = new JFXDecorator(stage, container.getView()); - decorator.setCustomMaximize(true); - decorator.setGraphic(new SVGGlyph("")); - - stage.setTitle("JFoenix Demo"); - - double width = 800; - double height = 600; - try { - Rectangle2D bounds = Screen.getScreens().get(0).getBounds(); - width = bounds.getWidth() / 2.5; - height = bounds.getHeight() / 1.35; - }catch (Exception e){ } - - Scene scene = new Scene(decorator, width, height); - final ObservableList stylesheets = scene.getStylesheets(); - stylesheets.addAll(JFoenixResources.load("css/jfoenix-fonts.css").toExternalForm(), - JFoenixResources.load("css/jfoenix-design.css").toExternalForm(), - MainDemo.class.getResource("/css/jfoenix-main-demo.css").toExternalForm()); - stage.setScene(scene); - stage.show(); - } - -} diff --git a/demo/src/main/java/demos/components/AlertDemo.java b/demo/src/main/java/demos/components/AlertDemo.java deleted file mode 100644 index 9a558290..00000000 --- a/demo/src/main/java/demos/components/AlertDemo.java +++ /dev/null @@ -1,55 +0,0 @@ -package demos.components; - -import com.jfoenix.animation.alert.JFXAlertAnimation; -import com.jfoenix.controls.*; -import com.jfoenix.controls.JFXDrawer.DrawerDirection; -import demos.components.base.Overdrive; -import javafx.animation.Interpolator; -import javafx.animation.KeyFrame; -import javafx.animation.KeyValue; -import javafx.animation.Timeline; -import javafx.application.Application; -import javafx.collections.ObservableList; -import javafx.scene.CacheHint; -import javafx.scene.Group; -import javafx.scene.Node; -import javafx.scene.Scene; -import javafx.scene.control.*; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.Pane; -import javafx.scene.layout.StackPane; -import javafx.scene.paint.Color; -import javafx.scene.shape.Circle; -import javafx.stage.*; -import javafx.util.Duration; - -import static javafx.scene.input.MouseEvent.MOUSE_PRESSED; - -public class AlertDemo extends Overdrive { - - private Button leftButton; - - @Override - public Node build() { - leftButton = new JFXButton("Alert"); - leftButton.setLayoutX(50); - leftButton.setLayoutY(50); - return new Group(leftButton); - } - - @Override - protected void afterShow(Stage stage) { - JFXDialogLayout layout = new JFXDialogLayout(); - layout.setBody(new Label("Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.")); - JFXAlert alert = new JFXAlert<>(stage); - alert.setOverlayClose(true); - alert.setAnimation(JFXAlertAnimation.CENTER_ANIMATION); - alert.setContent(layout); - alert.initModality(Modality.NONE); - leftButton.setOnAction(action-> alert.showAndWait()); - } - - public static void main(String[] args) { - launch(args); - } -} diff --git a/demo/src/main/java/demos/components/AnimationDemo.java b/demo/src/main/java/demos/components/AnimationDemo.java deleted file mode 100644 index 6af5aaac..00000000 --- a/demo/src/main/java/demos/components/AnimationDemo.java +++ /dev/null @@ -1,182 +0,0 @@ -package demos.components; - -import com.jfoenix.animation.JFXNodesAnimation; -import com.jfoenix.controls.JFXHamburger; -import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition; -import javafx.animation.Animation; -import javafx.animation.KeyFrame; -import javafx.animation.KeyValue; -import javafx.animation.Timeline; -import javafx.application.Application; -import javafx.collections.ObservableList; -import javafx.geometry.Insets; -import javafx.geometry.Pos; -import javafx.scene.Scene; -import javafx.scene.input.MouseEvent; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.Pane; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; -import javafx.util.Duration; - -import static javafx.animation.Interpolator.EASE_BOTH; - -public class AnimationDemo extends Application { - - - public static final String STYLE = "-fx-background-radius:50; -fx-min-width:50; -fx-min-height:50;"; - - @Override - public void start(Stage stage) { - - FlowPane main = new FlowPane(); - main.setVgap(20); - main.setHgap(20); - - StackPane colorPane = new StackPane(); - colorPane.setStyle(STYLE); - colorPane.getStyleClass().add("red-500"); - main.getChildren().add(colorPane); - - StackPane colorPane1 = new StackPane(); - colorPane1.setStyle(STYLE); - colorPane1.getStyleClass().add("blue-500"); - - StackPane placeHolder = new StackPane(colorPane1); - placeHolder.setStyle(STYLE); - main.getChildren().add(placeHolder); - - - StackPane colorPane2 = new StackPane(); - colorPane2.setStyle(STYLE); - colorPane2.getStyleClass().add("green-500"); - main.getChildren().add(colorPane2); - - StackPane colorPane3 = new StackPane(); - colorPane3.setStyle(STYLE); - colorPane3.getStyleClass().add("yellow-500"); - main.getChildren().add(colorPane3); - - - StackPane colorPane4 = new StackPane(); - colorPane4.setStyle(STYLE); - colorPane4.getStyleClass().add("purple-500"); - main.getChildren().add(colorPane4); - - - StackPane wizard = new StackPane(); - wizard.getChildren().add(main); - StackPane.setMargin(main, new Insets(100)); - wizard.setStyle("-fx-background-color:WHITE"); - - StackPane nextPage = new StackPane(); - - StackPane newPlaceHolder = new StackPane(); - newPlaceHolder.setStyle("-fx-background-radius:50; -fx-max-width:50; -fx-max-height:50;"); - nextPage.getChildren().add(newPlaceHolder); - StackPane.setAlignment(newPlaceHolder, Pos.TOP_LEFT); - - - JFXHamburger h4 = new JFXHamburger(); - h4.setMaxSize(40, 40); - HamburgerBackArrowBasicTransition burgerTask3 = new HamburgerBackArrowBasicTransition(h4); - burgerTask3.setRate(-1); - h4.addEventHandler(MouseEvent.MOUSE_PRESSED, e -> { - burgerTask3.setRate(burgerTask3.getRate() * -1); - burgerTask3.play(); - }); - nextPage.getChildren().add(h4); - StackPane.setAlignment(h4, Pos.TOP_LEFT); - StackPane.setMargin(h4, new Insets(10)); - - - JFXNodesAnimation animation = new FlowPaneStackPaneJFXNodesAnimation(main, - nextPage, - wizard, - colorPane1); - - colorPane1.setOnMouseClicked((click) -> animation.animate()); - - final Scene scene = new Scene(wizard, 800, 200); - final ObservableList stylesheets = scene.getStylesheets(); - stylesheets.addAll(ButtonDemo.class.getResource("/css/jfoenix-design.css").toExternalForm(), - ButtonDemo.class.getResource("/css/jfoenix-components.css").toExternalForm()); - stage.setTitle("JFX Button Demo"); - stage.setScene(scene); - stage.show(); - - } - - public static void main(String[] args) { - launch(args); - } - - private static final class FlowPaneStackPaneJFXNodesAnimation extends JFXNodesAnimation { - private final Pane tempPage; - private final FlowPane main; - private final StackPane nextPage; - private final StackPane wizard; - private final StackPane colorPane1; - - private double newX; - private double newY; - - FlowPaneStackPaneJFXNodesAnimation(final FlowPane main, final StackPane nextPage, final StackPane wizard, - final StackPane colorPane1) { - super(main, nextPage); - this.main = main; - this.nextPage = nextPage; - this.wizard = wizard; - this.colorPane1 = colorPane1; - tempPage = new Pane(); - newX = 0; - newY = 0; - } - - @Override - public void init() { - nextPage.setOpacity(0); - wizard.getChildren().add(tempPage); - wizard.getChildren().add(nextPage); - newX = colorPane1.localToScene(colorPane1.getBoundsInLocal()).getMinX(); - newY = colorPane1.localToScene(colorPane1.getBoundsInLocal()).getMinY(); - tempPage.getChildren().add(colorPane1); - colorPane1.setTranslateX(newX); - colorPane1.setTranslateY(newY); - } - - @Override - public void end() { - - } - - @Override - public Animation animateSharedNodes() { - return new Timeline(); - } - - @Override - public Animation animateExit() { - final Integer endValue = 0; - return new Timeline( - new KeyFrame(Duration.millis(300), - new KeyValue(main.opacityProperty(), endValue, EASE_BOTH)), - new KeyFrame(Duration.millis(520), - new KeyValue(colorPane1.translateXProperty(), endValue, EASE_BOTH), - new KeyValue(colorPane1.translateYProperty(), endValue, EASE_BOTH)), - new KeyFrame(Duration.millis(200), - new KeyValue(colorPane1.scaleXProperty(), 1, EASE_BOTH), - new KeyValue(colorPane1.scaleYProperty(), 1, EASE_BOTH)), - new KeyFrame(Duration.millis(1000), - new KeyValue(colorPane1.scaleXProperty(), 40, EASE_BOTH), - new KeyValue(colorPane1.scaleYProperty(), 40, EASE_BOTH))); - } - - @Override - public Animation animateEntrance() { - return new Timeline(new KeyFrame(Duration.millis(320), - new KeyValue(nextPage.opacityProperty(), 1, EASE_BOTH))); - } - - } -} diff --git a/demo/src/main/java/demos/components/ButtonDemo.java b/demo/src/main/java/demos/components/ButtonDemo.java deleted file mode 100644 index 435f2ba9..00000000 --- a/demo/src/main/java/demos/components/ButtonDemo.java +++ /dev/null @@ -1,48 +0,0 @@ -package demos.components; - -import com.jfoenix.controls.JFXButton; -import javafx.application.Application; -import javafx.geometry.Insets; -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; - -public final class ButtonDemo extends Application { - - @Override - public void start(Stage stage) { - FlowPane main = new FlowPane(); - main.setVgap(20); - main.setHgap(20); - - main.getChildren().add(new Button("Java Button")); - JFXButton jfoenixButton = new JFXButton("JFoenix Button"); - main.getChildren().add(jfoenixButton); - - JFXButton button = new JFXButton("RAISED BUTTON"); - button.getStyleClass().add("button-raised"); - main.getChildren().add(button); - - JFXButton button1 = new JFXButton("DISABLED"); - button1.setDisable(true); - main.getChildren().add(button1); - - StackPane pane = new StackPane(); - pane.getChildren().add(main); - StackPane.setMargin(main, new Insets(100)); - pane.setStyle("-fx-background-color:WHITE"); - - final Scene scene = new Scene(pane, 800, 200); - scene.getStylesheets().add(ButtonDemo.class.getResource("/css/jfoenix-components.css").toExternalForm()); - stage.setTitle("JFX Button Demo"); - stage.setScene(scene); - stage.show(); - } - - public static void main(String[] args) { - launch(args); - } - -} diff --git a/demo/src/main/java/demos/components/CheckBoxDemo.java b/demo/src/main/java/demos/components/CheckBoxDemo.java deleted file mode 100644 index 1f328192..00000000 --- a/demo/src/main/java/demos/components/CheckBoxDemo.java +++ /dev/null @@ -1,50 +0,0 @@ -package demos.components; - -import com.jfoenix.controls.JFXCheckBox; -import javafx.application.Application; -import javafx.geometry.Insets; -import javafx.scene.Scene; -import javafx.scene.control.CheckBox; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; - -public class CheckBoxDemo extends Application { - - private static int step = 1; - - @Override - public void start(Stage stage) { - - FlowPane main = new FlowPane(); - main.setVgap(20); - main.setHgap(20); - - CheckBox cb = new CheckBox("CheckBox"); - JFXCheckBox jfxCheckBox = new JFXCheckBox("JFX CheckBox"); - JFXCheckBox customJFXCheckBox = new JFXCheckBox("Custom JFX CheckBox"); - customJFXCheckBox.getStyleClass().add("custom-jfx-check-box"); - - main.getChildren().add(cb); - main.getChildren().add(jfxCheckBox); - main.getChildren().add(customJFXCheckBox); - - StackPane pane = new StackPane(); - pane.getChildren().add(main); - StackPane.setMargin(main, new Insets(100)); - pane.setStyle("-fx-background-color:WHITE"); - - final Scene scene = new Scene(pane, 600, 200); - scene.getStylesheets().add(CheckBoxDemo.class.getResource("/css/jfoenix-components.css").toExternalForm()); - stage.setTitle("JFX CheckBox Demo "); - stage.setScene(scene); - stage.setResizable(false); - stage.show(); - - } - - public static void main(String[] args) { - launch(args); - } - -} diff --git a/demo/src/main/java/demos/components/ChipViewDemo.java b/demo/src/main/java/demos/components/ChipViewDemo.java deleted file mode 100644 index ac66b12f..00000000 --- a/demo/src/main/java/demos/components/ChipViewDemo.java +++ /dev/null @@ -1,36 +0,0 @@ -package demos.components; - -import com.jfoenix.controls.JFXChipView; -import javafx.application.Application; -import javafx.geometry.Insets; -import javafx.scene.Scene; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; - -public final class ChipViewDemo extends Application { - - @Override - public void start(Stage stage) { - JFXChipView chipView = new JFXChipView<>(); - chipView.getChips().addAll("WEF", "WWW", "JD"); - chipView.getSuggestions().addAll("HELLO", "TROLL", "WFEWEF", "WEF"); - chipView.setStyle("-fx-background-color: WHITE;"); - - StackPane pane = new StackPane(); - pane.getChildren().add(chipView); - StackPane.setMargin(chipView, new Insets(100)); - pane.setStyle("-fx-background-color:GRAY;"); - - final Scene scene = new Scene(pane, 500, 500); -// scene.getStylesheets().add(TagAreaDemo.class.getResource("/css/jfoenix-components.css").toExternalForm()); - stage.setTitle("JFX Button Demo"); - stage.setScene(scene); - stage.show(); -// ScenicView.show(scene); - } - - public static void main(String[] args) { - launch(args); - } - -} diff --git a/demo/src/main/java/demos/components/ColorPickerDemo.java b/demo/src/main/java/demos/components/ColorPickerDemo.java deleted file mode 100644 index 7d065379..00000000 --- a/demo/src/main/java/demos/components/ColorPickerDemo.java +++ /dev/null @@ -1,46 +0,0 @@ -package demos.components; - -import com.jfoenix.controls.JFXColorPicker; -import javafx.application.Application; -import javafx.geometry.Insets; -import javafx.scene.Scene; -import javafx.scene.layout.FlowPane; -import javafx.scene.layout.StackPane; -import javafx.scene.paint.Color; -import javafx.stage.Stage; - -public class ColorPickerDemo extends Application { - - - @Override - public void start(Stage stage) { - - FlowPane main = new FlowPane(); - main.setVgap(20); - main.setHgap(20); - - javafx.scene.control.ColorPicker picker = new javafx.scene.control.ColorPicker(Color.RED); - picker.getStyleClass().add("button"); - // picker.getStyleClass().add("split-button"); - main.getChildren().add(picker); - - main.getChildren().add(new JFXColorPicker()); - - StackPane pane = new StackPane(); - pane.getChildren().add(main); - StackPane.setMargin(main, new Insets(100)); - pane.setStyle("-fx-background-color:WHITE"); - - final Scene scene = new Scene(pane, 800, 200); - // scene.getStylesheets().add(ButtonDemo.class.getResource("/css/jfoenix-components.css").toExternalForm()); - stage.setTitle("JFX Button Demo"); - stage.setScene(scene); - stage.show(); - - } - - public static void main(String[] args) { - launch(args); - } - -} diff --git a/demo/src/main/java/demos/components/ComboBoxDemo.java b/demo/src/main/java/demos/components/ComboBoxDemo.java deleted file mode 100644 index 933e7054..00000000 --- a/demo/src/main/java/demos/components/ComboBoxDemo.java +++ /dev/null @@ -1,52 +0,0 @@ -package demos.components; - -import com.jfoenix.controls.JFXComboBox; -import javafx.application.Application; -import javafx.geometry.Insets; -import javafx.scene.Scene; -import javafx.scene.control.Label; -import javafx.scene.layout.HBox; -import javafx.stage.Stage; -import javafx.util.StringConverter; - -public class ComboBoxDemo extends Application { - - @Override - public void start(Stage primaryStage) throws Exception { - JFXComboBox