GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from GabrielTofvesson/master

Browse Source 
new
This commit is contained in:
Taco Dev 2016-11-06 12:55:00 +01:00 committed by GitHub
commit 4f48b3ce8a
11 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TAL.iml
View File

@ -8,5 +8,14 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="libRefTools" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/redist/annotations-java8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

BIN
libs/libRefTools.jar
View File

Binary file not shown.

29
src/Launcher/Main.java
View File

@ -15,6 +15,7 @@ import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Tab;
import javafx.scene.control.TextField;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@ -30,13 +31,14 @@ public class Main extends Application {
public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml"); // Launcher body
private double xOffset = 0, yOffset = 0; // Offsets for dragging
private Button exit, min, Home_btn, Modpack_btn, Settings_btn; // Define buttons
private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_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;
Async stringUpdater;
@Override
public void start(Stage primaryStage) throws Exception{
@ -60,6 +62,7 @@ public class Main extends Application {
Home_btn = (Button) root.lookup("#Home-btn");
Modpack_btn = (Button) root.lookup("#Modpacks-btn");
Settings_btn = (Button) root.lookup("#Settings-btn");
Instance_btn = (Button) root.lookup("#Instance-btn");
tab = (Pane) root.lookup("#tab");
@ -80,8 +83,21 @@ public class Main extends Application {
Modpack_btn.setOnMouseClicked(event ->{
if(activeTab!=Tabs.Modpacks){
if(stringUpdater!=null && stringUpdater.isAlive()) stringUpdater.cancel();
(activeTab=Tabs.Modpacks).switchTab(tab); // Sets the active tab to the modpacks tab unless it's already active
//TODO: Create a dynamic updating string from the input ( Text Field )
//TODO: Create a dynamic updating string from the input ( Text Field ) *-* Done *-*
stringUpdater = new Async(SafeReflection.getFirstMethod(Main.class, "detectStringUpdate"), Tabs.Modpacks.loaded.lookup("#search-modpacks"));
}
});
Instance_btn.setOnMouseClicked(event -> {
if(activeTab!=Tabs.Instance){
(activeTab = Tabs.Instance).switchTab(tab);
}
});
@ -93,9 +109,6 @@ public class Main extends Application {
});
Async a = new Async(null, SafeReflection.getMethod(getClass(), "run", (Class<?>[]) null), null);
System.out.println(a.await());
// Drag
dragBar.setOnMousePressed(event -> {
xOffset = event.getSceneX();
@ -116,8 +129,10 @@ public class Main extends Application {
launch(args);
}
public static int run(){
return 1500;
public static void detectStringUpdate(TextField toRead){
String s = "";
while(true) if(!s.equals(toRead.getText())) System.out.println(s = toRead.getText());
}
}

5
src/Launcher/Tabs.java
View File

@ -8,7 +8,10 @@ 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"));
Modpacks(Tabs.class.getResource("../assets/layout/modpacks.fxml")),
Home(Tabs.class.getResource("../assets/layout/home.fxml")),
Settings(Tabs.class.getResource("../assets/layout/settings.fxml")),
Instance(Tabs.class.getResource("../assets/layout/instance.fxml"));
/**
* Url referencing xml.

11
src/assets/layout/home.fxml
View File

@ -5,18 +5,15 @@
<?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">
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="5.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>

18
src/assets/layout/instance.fxml Normal file
View File

@ -0,0 +1,18 @@
<?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="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="5.0" text="Instances" textFill="WHITE">
<font>
<Font name="Centaur" size="31.0" />
</font>
</Label>
</children>
</Pane>

9
src/assets/layout/main.fxml
View File

@ -29,13 +29,18 @@
<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">
<Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Instances" textFill="WHITE" textOverrun="CLIP">
<font>
<Font name="Centaur" size="16.0" />
</font>
</Button>
<Button id="Settings-btn" layoutY="170.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="17.0" layoutY="455.0" text="Version : PreDev-0.0.1" textFill="white" />
<Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
<font>
<Font size="11.0" />

8
src/assets/layout/modpacks.fxml
View File

@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?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">
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="5.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" />
<TextField id="search-modpacks" layoutX="516.0" layoutY="5.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
</children>
</Pane>

23
src/assets/layout/sample.fxml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Hyperlink?>
<?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" 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="@../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" />
</font>
</Label>
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#e4e4e4" height="450.0" layoutX="-1.0" layoutY="50.0" strokeType="INSIDE" style="-fx-fill: rgb(29, 31, 48);" width="145.0" />
<Hyperlink id="hyperlink" layoutX="26.0" layoutY="66.0" text="Our Modpacks" />
<Hyperlink layoutX="26.0" layoutY="102.0" text="Settings" />
</children>
</Pane>

6
src/assets/layout/settings.fxml
View File

@ -5,13 +5,15 @@
<?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">
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="5.0" text="Settings" textFill="WHITE">
<font>
<Font name="Centaur" size="31.0" />
</font>
</Label>
</children>
</Pane>

4
src/assets/style/nav.css
View File

@ -13,10 +13,10 @@
#min:hover, #exit:hover{
-fx-background-color: #bf0000;
}
#Home-btn, #Modpacks-btn, #Settings-btn {
#Home-btn, #Modpacks-btn, #Settings-btn, #Instance-btn {
-fx-background-color: rgba(0, 0, 0, 0);
}
#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover {
#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover, #Instance-btn:hover {
-fx-background-color: #0c182d;
-fx-background-radius: 0em;
}