diff --git a/dev/20200225/law39/Switch Scenes/hellofx/.idea/hellofx.iml b/dev/20200225/law39/Switch Scenes/hellofx/.idea/hellofx.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/dev/20200225/law39/Switch Scenes/hellofx/.idea/hellofx.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/dev/20200225/law39/Switch Scenes/hellofx/.idea/modules.xml b/dev/20200225/law39/Switch Scenes/hellofx/.idea/modules.xml new file mode 100644 index 0000000..960167d --- /dev/null +++ b/dev/20200225/law39/Switch Scenes/hellofx/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/dev/20200225/law39/Switch Scenes/hellofx/.idea/vcs.xml b/dev/20200225/law39/Switch Scenes/hellofx/.idea/vcs.xml index 94a25f7..e15e368 100644 --- a/dev/20200225/law39/Switch Scenes/hellofx/.idea/vcs.xml +++ b/dev/20200225/law39/Switch Scenes/hellofx/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/dev/20200414/top19/flashcardfx/hellofx/.idea/vcs.xml b/dev/20200414/top19/flashcardfx/hellofx/.idea/vcs.xml new file mode 100644 index 0000000..bc59970 --- /dev/null +++ b/dev/20200414/top19/flashcardfx/hellofx/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dev/20200414/top19/flashcardfx/hellofx/.idea/workspace.xml b/dev/20200414/top19/flashcardfx/hellofx/.idea/workspace.xml index 598071f..d7a3843 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/.idea/workspace.xml +++ b/dev/20200414/top19/flashcardfx/hellofx/.idea/workspace.xml @@ -155,8 +155,8 @@ - @@ -264,7 +264,7 @@ - + diff --git a/dev/20200414/top19/flashcardfx/hellofx/pom.xml b/dev/20200414/top19/flashcardfx/hellofx/pom.xml index 71a830f..694447c 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/pom.xml +++ b/dev/20200414/top19/flashcardfx/hellofx/pom.xml @@ -9,7 +9,7 @@ 11 13 - + org.openjfx javafx-controls diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/jsonStuff/WelshDictionary.java b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/jsonStuff/WelshDictionary.java index 2f407b1..7b57538 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/jsonStuff/WelshDictionary.java +++ b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/jsonStuff/WelshDictionary.java @@ -4,9 +4,10 @@ public class WelshDictionary { private String english; private String welsh; private String wordType; - + private boolean practiceWord; public WelshDictionary() { + practiceWord = false; } public WelshDictionary(String english, String welsh, String wordType) { @@ -39,6 +40,14 @@ public class WelshDictionary { this.wordType = wordType; } + public boolean isPracticeWord() { + return practiceWord; + } + + public void setPracticeWord(boolean practiceWord) { + this.practiceWord = practiceWord; + } + @Override public String toString() { return "WelshDictionary{" + diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/App.java b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/App.java index c3af887..f0bf418 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/App.java +++ b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/App.java @@ -2,12 +2,10 @@ package org.openjfx.javaFX; import javafx.application.Application; import javafx.application.Platform; -import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import javafx.stage.WindowEvent; import jsonStuff.JsonProcessing; import jsonStuff.WelshDictionary; diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/PrimaryController.java b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/PrimaryController.java index 2f8fcc6..ab9527f 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/PrimaryController.java +++ b/dev/20200414/top19/flashcardfx/hellofx/src/main/java/org/openjfx/javaFX/PrimaryController.java @@ -3,13 +3,12 @@ package org.openjfx.javaFX; import javafx.animation.*; import javafx.fxml.FXML; import javafx.scene.Node; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; import javafx.scene.shape.Rectangle; import javafx.scene.text.Text; import javafx.scene.transform.Rotate; import javafx.util.Duration; -import jsonStuff.WelshDictionary; - -import java.util.Stack; public class PrimaryController { int index = 0; @@ -24,6 +23,11 @@ public class PrimaryController { @FXML private Text testWord; + @FXML + private ImageView left_arrow; + @FXML + private ImageView right_arrow; + @FXML private void initialize() { testWord.setText(App.words.getFirst().getWelsh()); @@ -31,6 +35,12 @@ public class PrimaryController { updateCounter(); card = flashcard; + + Image left = new Image(getClass().getResource("/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png").toExternalForm()); + Image right = new Image(getClass().getResourceAsStream("/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png")); + + left_arrow.setImage(left); + right_arrow.setImage(right); } @FXML diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png new file mode 100644 index 0000000..e0812e9 Binary files /dev/null and b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png new file mode 100644 index 0000000..51fbe5d Binary files /dev/null and b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/sample.fxml b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/sample.fxml index a2d52bd..028abdc 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/sample.fxml +++ b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/sample.fxml @@ -1,43 +1,41 @@ - - - + + stylesheets="@styles.css" fx:controller="org.openjfx.javaFX.PrimaryController" alignment="center" spacing="10"> - - + - + - + - - - + + + diff --git a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/styles.css b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/styles.css index 65f6003..5c0b525 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/styles.css +++ b/dev/20200414/top19/flashcardfx/hellofx/src/main/resources/org/openjfx/javaFX/styles.css @@ -1,3 +1,7 @@ .button { -fx-text-fill: blue; } + +#counter { + -fx-text-fill: blue; +} \ No newline at end of file diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png b/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png new file mode 100644 index 0000000..e0812e9 Binary files /dev/null and b/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-left-50.png differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png b/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png new file mode 100644 index 0000000..51fbe5d Binary files /dev/null and b/dev/20200414/top19/flashcardfx/hellofx/target/classes/assets/docs_ui_spec_presentation_src_img_Icons_icons8-right-50.png differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/jsonStuff/WelshDictionary.class b/dev/20200414/top19/flashcardfx/hellofx/target/classes/jsonStuff/WelshDictionary.class index f6f0aef..221487f 100644 Binary files a/dev/20200414/top19/flashcardfx/hellofx/target/classes/jsonStuff/WelshDictionary.class and b/dev/20200414/top19/flashcardfx/hellofx/target/classes/jsonStuff/WelshDictionary.class differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/App.class b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/App.class index 79c3ec1..86ef2e2 100644 Binary files a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/App.class and b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/App.class differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/PrimaryController.class b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/PrimaryController.class index 1e6a5b0..46fae08 100644 Binary files a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/PrimaryController.class and b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/PrimaryController.class differ diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/sample.fxml b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/sample.fxml index a2d52bd..028abdc 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/sample.fxml +++ b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/sample.fxml @@ -1,43 +1,41 @@ - - - + + stylesheets="@styles.css" fx:controller="org.openjfx.javaFX.PrimaryController" alignment="center" spacing="10"> - - + - + - + - - - + + + diff --git a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/styles.css b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/styles.css index 65f6003..5c0b525 100644 --- a/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/styles.css +++ b/dev/20200414/top19/flashcardfx/hellofx/target/classes/org/openjfx/javaFX/styles.css @@ -1,3 +1,7 @@ .button { -fx-text-fill: blue; } + +#counter { + -fx-text-fill: blue; +} \ No newline at end of file