diff --git a/src/main/java/app/CarControlBoard.java b/src/main/java/app/CarControlBoard.java index f43f179..8078d1b 100644 --- a/src/main/java/app/CarControlBoard.java +++ b/src/main/java/app/CarControlBoard.java @@ -66,6 +66,7 @@ public void start(Stage primaryStage) throws IOException { mainController.initWebcams(); mainController.initApplicationSettings(); mainController.initPhotoTab(); + mainController.initPhoneTab(); //conflict with mainController.initWebcams() just because it uses it own version of an opencv lib? System.loadLibrary(Core.NATIVE_LIBRARY_NAME); diff --git a/src/main/java/controllers/MainController.java b/src/main/java/controllers/MainController.java index e9b0ebd..2c613b7 100644 --- a/src/main/java/controllers/MainController.java +++ b/src/main/java/controllers/MainController.java @@ -26,6 +26,7 @@ import controllers.openvc.MagicTabController; import controllers.openvc.RecognizingTypeOfClassifier; import controllers.openvc.RecognizingTypeOfDetection; +import controllers.phone.PhoneTabController; import controllers.settings.ApplicationSettingsController; import controllers.settings.LanguageList; import controllers.settings.StyleList; @@ -247,4 +248,9 @@ public void initOpenCVTab() { magicTabController.init() .showSimpleCameraInto(imageViewForOpenCV); } + + public void initPhoneTab() { + final PhoneTabController phoneTabController = new PhoneTabController(); + phoneTabController.initPhone(); + } } diff --git a/src/main/java/controllers/phone/PhoneTabController.java b/src/main/java/controllers/phone/PhoneTabController.java new file mode 100644 index 0000000..b4c11f9 --- /dev/null +++ b/src/main/java/controllers/phone/PhoneTabController.java @@ -0,0 +1,12 @@ +package controllers.phone; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PhoneTabController { + private final static Logger LOGGER = LoggerFactory.getLogger(PhoneTabController.class); + + public void initPhone() { + LOGGER.info("Nothing to do. TODO"); + } +} diff --git a/src/main/resources/css/anchorpane_phone.css b/src/main/resources/css/anchorpane_phone.css new file mode 100644 index 0000000..5fa116e --- /dev/null +++ b/src/main/resources/css/anchorpane_phone.css @@ -0,0 +1,7 @@ +#dark-blue { + -fx-background-color: + #090a0c, + linear-gradient(#38424b 0%, #1f2429 20%, #191d22 100%), + linear-gradient(#20262b, #191d22), + radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9), rgba(255,255,255,0)); +} \ No newline at end of file diff --git a/src/main/resources/css/phone_pad.css b/src/main/resources/css/phone_pad.css new file mode 100644 index 0000000..a19a0c2 --- /dev/null +++ b/src/main/resources/css/phone_pad.css @@ -0,0 +1,14 @@ +.button { + -fx-alignment: center; + -fx-background-color: + #99ccff, + linear-gradient(#38424b 0%, #1f2429 20%, #99ccff 100%), + linear-gradient(#99ccff, #191d22), + radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9), rgba(255,255,255,0)); + -fx-border-color: black; + -fx-font-size: 30; + -fx-text-fill: white; + -fx-text-alignment: center; + -fx-border-radius: 10 10 10 10; + -fx-background-radius: 10 10 10 10; +} \ No newline at end of file diff --git a/src/main/resources/css/phone_pad_1.css b/src/main/resources/css/phone_pad_1.css new file mode 100644 index 0000000..5cbc021 --- /dev/null +++ b/src/main/resources/css/phone_pad_1.css @@ -0,0 +1,44 @@ +#green_button { + -fx-alignment: center; + -fx-background-color: + #99ccff, + linear-gradient(#99ff99 0%, #e6ffe6 20%, #00b300 100%), + linear-gradient(#99ff99, #00b300), + radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9), rgba(255,255,255,0)); + -fx-border-color: black; + -fx-font-size: 30; + -fx-text-fill: white; + -fx-text-alignment: center; + -fx-border-radius: 10 10 10 10; + -fx-background-radius: 10 10 10 10; +} + +#red_button { + -fx-alignment: center; + -fx-background-color: + #99ccff, + linear-gradient(#ffc2b3 0%, #ffd6cc 20%, #cc2900 100%), + linear-gradient(#ffc2b3, #cc2900), + radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9), rgba(255,255,255,0)); + -fx-border-color: black; + -fx-font-size: 30; + -fx-text-fill: white; + -fx-text-alignment: center; + -fx-border-radius: 10 10 10 10; + -fx-background-radius: 10 10 10 10; +} + +#yellow_button { + -fx-alignment: center; + -fx-background-color: + #fff0b3, + linear-gradient(#ffc2b3 0%, #ffd6cc 20%, #cc2900 100%), + linear-gradient(#fff0b3, #cc2900), + radial-gradient(center 50% 0%, radius 100%, rgba(255, 153, 102,0.9), rgba(255,255,255,0)); + -fx-border-color: black; + -fx-font-size: 30; + -fx-text-fill: white; + -fx-text-alignment: center; + -fx-border-radius: 10 10 10 10; + -fx-background-radius: 10 10 10 10; +} \ No newline at end of file diff --git a/src/main/resources/fxml/base_form.fxml b/src/main/resources/fxml/base_form.fxml index e4165c1..ca8a160 100644 --- a/src/main/resources/fxml/base_form.fxml +++ b/src/main/resources/fxml/base_form.fxml @@ -1,5 +1,7 @@ + + @@ -31,7 +33,7 @@ - + @@ -94,6 +96,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/pic/bush_doing_it_wrong.jpg b/src/main/resources/pic/bush_doing_it_wrong.jpg new file mode 100644 index 0000000..ceb18b0 Binary files /dev/null and b/src/main/resources/pic/bush_doing_it_wrong.jpg differ diff --git a/src/main/resources/pic/starman.jpg b/src/main/resources/pic/starman.jpg new file mode 100644 index 0000000..ebab69c Binary files /dev/null and b/src/main/resources/pic/starman.jpg differ