Merge pull request #4 from GabrielTofvesson/master

.
2016-10-30 20:12:15 +01:00 · 2016-10-30 20:12:15 +01:00 · f14dbdc071
commit f14dbdc071
parent 43e497f9e6 4eb36f27fa
15 changed files with 257 additions and 58 deletions
--- a/.idea/libraries/libRefTools.xml
+++ b/.idea/libraries/libRefTools.xml
@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="libRefTools">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/libs/libRefTools.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/libs/libRefTools.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/TAL.iml
+++ b/TAL.iml
@ -7,6 +7,6 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libRefTools" level="project" />
  </component>
-</module>
-
+</module>
--- a/libs/libRefTools.jar
+++ b/libs/libRefTools.jar
--- a/src/Launcher/Controller.java
+++ b/src/Launcher/Controller.java
@ -1,4 +0,0 @@
-package Launcher;
-
-public class Controller {
-}
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@ -1,46 +1,114 @@
+/*
+NOTE TO ANY READERS:
+Check out "Rogue - Atlantic". It's a pretty sweet song though I must say that Flo Rida has some pretty good songs too.
+Either way, I'd recommend some music if you're considering reading through this hell. Honestly, I feel like even my
+not-so-messy code is extremely messy just because of how I work. I mean, I try to make the code readable but people
+always tell me that it's virtually unreadable and it doesn't help that it's difficult to explain to them what the code
+does without them losing interest. Also, in case you are actually, seriously going to read this crap, do yourself a
+favour and pour yourself some nice Jack Daniels. You deserve it if you're going to read through this.
+ */
+
 package Launcher;

+import com.tofvesson.reflection.SafeReflection;
 import javafx.application.Application;
-import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import java.awt.*;
-import java.net.URI;
+
+import javafx.scene.input.KeyEvent;
+import java.net.URL;
+import com.tofvesson.async.*;

 public class Main extends Application {

-    private double xOffset = 0;
-    private double yOffset = 0;
+    public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml");                        // Launcher body

-    volatile double[] posOrigin = {0, 0};
+    private double xOffset = 0, yOffset = 0;                                                                            // Offsets for dragging
+    private Button exit, min, Home_btn, Modpack_btn, Settings_btn;                                 // Define buttons
+    private ImageView icon;
+    private TextField Search_modpacks;
+    private Image appIcon;
+    private Rectangle dragBar;                                                                                          // Draggable top bar
+    private Pane root, tab;
+    private Tabs activeTab = Tabs.Home;

    @Override
    public void start(Stage primaryStage) throws Exception{

-        primaryStage.initStyle(StageStyle.UNDECORATED);
-        Parent root = FXMLLoader.load(getClass().getResource("Main_Launcher.fxml"));
+        primaryStage.initStyle(StageStyle.UNDECORATED);                                                                 // Remove ugly trash
+
+        root = FXMLLoader.load(mainLauncher);
        primaryStage.setTitle("Team-Avion Launcher [WIP]");
        primaryStage.setScene(new Scene(root, 900, 500));
        primaryStage.show();
+        primaryStage.getIcons().clear();
+        primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("../assets/icons/app.png")));

-        root.lookup("#exit").setOnMouseClicked(event -> primaryStage.close());
-        root.lookup("#min").setOnMouseClicked(event -> primaryStage.setIconified(true));
+
+        // Field initialization
+        exit = (Button) root.lookup("#exit");
+        min = (Button) root.lookup("#min");
+        dragBar = (Rectangle) root.lookup("#rectangle");
+        Home_btn = (Button) root.lookup("#Home-btn");
+        Modpack_btn = (Button) root.lookup("#Modpacks-btn");
+        Settings_btn = (Button) root.lookup("#Settings-btn");
+        tab = (Pane) root.lookup("#tab");
+        icon = (ImageView) root.lookup("#icon");
+        Search_modpacks = (TextField) root.lookup("#search-modpacks");
+
+
+        // Infrastructural navigation
+        exit.setOnMouseClicked(event -> primaryStage.close());                                                          // Closes the program if exit button is clicked
+        min.setOnMouseClicked(event -> primaryStage.setIconified(true));                                                // Minimizes the program if minimize button is clicked
+        Home_btn.setOnMouseClicked(event ->{if(activeTab!=Tabs.Home)(activeTab=Tabs.Home).switchTab(tab);});            // Sets the active tab to the home tab unless it's already active
+        Modpack_btn.setOnMouseClicked(event ->{
+            if(activeTab!=Tabs.Modpacks){
+                (activeTab=Tabs.Modpacks).switchTab(tab);                                                               // Sets the active tab to the modpacks tab unless it's already active
+                Tabs.Modpacks.loaded.lookup("#search-modpacks").setOnInputMethodTextChanged(System.out::println);
+                //TODO: Create a dynamic updating string for the input
+
+            }
+        });
+        Settings_btn.setOnMouseClicked(event ->{
+            if(activeTab!=Tabs.Settings){
+                (activeTab=Tabs.Settings).switchTab(tab);                                                               // Sets the active tab to the settings tab unless it's already active
+            }
+        });
+
+
+        Async a = new Async(null, SafeReflection.getMethod(getClass(), "run", (Class<?>[]) null), null);
+        System.out.println(a.await());

        // Drag
-        root.lookup("#rectangle").setOnMousePressed(event -> {
+        dragBar.setOnMousePressed(event -> {
            xOffset = event.getSceneX();
            yOffset = event.getSceneY();
        });
-
-        root.lookup("#rectangle").setOnMouseDragged(event -> {
+        dragBar.setOnMouseDragged(event -> {
            primaryStage.setX(event.getScreenX() - xOffset);
            primaryStage.setY(event.getScreenY() - yOffset);
        });
+
+
+        // Set up default layout
+        Tabs.Home.switchTab(tab);
+        icon.setImage(appIcon);
    }
+
    public static void main(String[] args) {
        launch(args);
    }
+
+    public static int run(){
+        return 500;
+    }
+
 }
--- a/src/Launcher/Main_Launcher.fxml
+++ b/src/Launcher/Main_Launcher.fxml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../assets/style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
-   <children>
-      <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../assets/style/nav.css" text="X" textFill="WHITE" />
-       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../assets/style/nav.css" text="-" textFill="WHITE" />
-       <Label layoutX="46.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
-         <font>
-            <Font name="Centaur" size="24.0" />
-         </font>
-      </Label>
-   </children>
-</Pane>
--- a/src/Launcher/Tabs.java
+++ b/src/Launcher/Tabs.java
@ -0,0 +1,34 @@
+package Launcher;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.layout.Pane;
+import java.io.IOException;
+import java.net.URL;
+
+public enum Tabs {
+
+    Modpacks(Tabs.class.getResource("../assets/layout/modpacks.fxml")), Home(Tabs.class.getResource("../assets/layout/home.fxml")), Settings(Tabs.class.getResource("../assets/layout/settings.fxml"));
+
+    /**
+     * Url referencing xml.
+     */
+    public final URL url;
+
+    /**
+     * Loaded layout
+     */
+    public final Parent loaded;
+
+    Tabs(URL url){
+        this.url = url;
+        Parent p = null;
+        try { p = FXMLLoader.load(url); } catch (IOException e) { e.printStackTrace(); }
+        loaded = p;
+    }
+
+    public void switchTab(Pane holder){
+        holder.getChildren().clear();
+        holder.getChildren().add(loaded);
+    }
+}
--- a/src/Launcher/net/Updater.java
+++ b/src/Launcher/net/Updater.java
@ -16,16 +16,16 @@ public class Updater {
        conn = new URL(URL).openConnection();
    }

-    public void download(){
-        //TODO: Download lots of
+    public void downloadStuff(){
+        //TODO: Download lots of stuff
    }

-    public void downloadMore(){
-        //TODO: Download more
+    public void downloadMoreStuff(){
+        //TODO: Download more stuff
    }

-    public void downloadEvenMore(){
-        //TODO: Download even more
+    public void downloadEvenMoreStuff(){
+        //TODO: Download even more stuff
    }

    public static Updater getInstance(String url) throws IOException {
--- a/src/assets/icons/app.png
+++ b/src/assets/icons/app.png
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.text.Font?>
+
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+      <Label layoutX="54.0" layoutY="9.0" text="Home" textFill="WHITE">
+         <font>
+            <Font name="Centaur" size="31.0" />
+         </font>
+      </Label>
+      <Label layoutX="314.0" layoutY="15.0" text="This is a Dev Build ... things are subject to change" textFill="RED">
+         <font>
+            <Font name="Centaur" size="21.0" />
+         </font>
+      </Label>
+   </children>
+</Pane>
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.text.Font?>
+
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="-" textFill="WHITE" />
+       <ImageView id="icon" fitHeight="30" fitWidth="30" layoutX="26.0" layoutY="11.0" />
+       <Label layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
+         <font>
+            <Font name="Centaur" size="24.0" />
+         </font>
+      </Label>
+      <Rectangle id="nav" arcHeight="5.0" arcWidth="5.0" fill="#101e38" height="450.0" layoutY="50.0" stroke="TRANSPARENT" strokeType="INSIDE" width="150.0" />
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Home" textFill="WHITE" textOverrun="CLIP">
+         <font>
+            <Font name="Centaur" size="16.0" />
+         </font>
+      </Button>
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Modpack" textFill="WHITE" textOverrun="CLIP">
+          <font>
+              <Font name="Centaur" size="16.0" />
+          </font>
+      </Button>
+       <Button id="Settings-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Settings" textFill="WHITE" textOverrun="CLIP">
+           <font>
+               <Font name="Centaur" size="16.0" />
+           </font>
+       </Button>
+      <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
+      <Label layoutX="26.0" layoutY="455.0" text="Version : Dev-0.0.1" textFill="white" />
+      <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
+         <font>
+            <Font size="11.0" />
+         </font>
+      </Label>
+   </children>
+</Pane>
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.text.Font?>
+
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="34.0" layoutY="9.0" text="Modpacks" textFill="WHITE">
+            <font>
+                <Font name="Centaur" size="31.0" />
+            </font>
+        </Label>
+      <TextField id="search-modpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
+    </children>
+</Pane>
--- a/src/assets/layout/sample.fxml
+++ b/src/assets/layout/sample.fxml
@ -10,7 +10,7 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" style="-fx-background-color: rgb(42, 44, 58);" xmlns="http://javafx.com/javafx/8.0.102" xmlns:fx="http://javafx.com/fxml/1">
   <children>
      <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" style="-fx-fill: rgb(29, 31, 48);" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" style="-fx-background-color: rgb(29, 31, 48);" stylesheets="@../assets/style/nav.css" text="X" textFill="WHITE" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" style="-fx-background-color: rgb(29, 31, 48);" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
      <Label layoutX="46.0" layoutY="11.0" text="Team Avion Launcher" textFill="WHITE">
         <font>
            <Font name="Centaur" size="24.0" />
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.text.Font?>
+
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
+        <Label layoutX="331.0" layoutY="9.0" text="Settings" textFill="WHITE">
+            <font>
+                <Font name="Centaur" size="31.0" />
+            </font>
+        </Label>
+    </children>
+</Pane>
--- a/src/assets/style/nav.css
+++ b/src/assets/style/nav.css
@ -1,20 +1,27 @@
 #pane {
-    -fx-background-color: rgba(38, 33, 33, 1)
+    -fx-background-color: #050f19;
 }
 #rectangle {
-    -fx-fill: rgba(30, 25, 25, 1)
+    -fx-fill: #031128;
 }
-#exit{
-    -fx-background-color: rgba(30, 25, 25, 1);
+#Modpack-back {
+    -fx-fill: #042344;
 }
-#min {
-    -fx-background-color: rgba(30, 25, 25, 1);
+#exit, #min{
+    -fx-background-color: rgba(30, 25, 25, 0);
 }
-#min:hover {
-    -fx-border-radius: 30px;
+#min:hover, #exit:hover{
    -fx-background-color: #bf0000;
 }
-#exit:hover{
-    -fx-border-radius: 30px;
-    -fx-background-color: #bf0000;
+#Home-btn, #Modpacks-btn, #Settings-btn {
+    -fx-background-color: rgba(0, 0, 0, 0);
+}
+#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover {
+    -fx-background-color: #0c182d;
+    -fx-background-radius: 0em;
+}
+#search-modpacks {
+    -fx-text-inner-color: white;
+    -fx-background-color: rgba(0, 0, 0, 0.5);
+    -fx-padding: 10px;
 }