Refactor login

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>BPGM</groupId>
     <artifactId>BPGM</artifactId>
-    <version>0.1.7-hotfix4</version>
+    <version>0.1.8</version>
     <build>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
@@ -67,7 +67,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${project.name}_v${project.version}</finalName>
+                    <finalName>BlossomsPogoManager</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <!-- MainClass in mainfest make a executable jar -->
                     <archive>
@@ -102,9 +102,9 @@
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>com.github.gegy1000</groupId>
+            <groupId>com.github.FernandoTBarros</groupId>
             <artifactId>PokeGOAPI-Java</artifactId>
-            <version>199cda2914ba0ac037d5e3690dee9021b32f37af</version>
+            <version>102b17b9d311310f3ecb4f7bc22752ccb5f17c67</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -132,6 +132,11 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.7</version>
+        </dependency>
+		<dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>3.9</version>
         </dependency>
     </dependencies>
 </project>

src/main/resources/layout/Login.fxml

@@ -3,37 +3,68 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-<StackPane xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
-    <children>
-        <StackPane prefHeight="0.0" prefWidth="0.0">
-            <children>
-                <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="10.0">
-                    <children>
-                        <TextField fx:id="usernameField" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="266.0" promptText="PTC Username:" />
-                        <PasswordField fx:id="passwordField" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="266.0" promptText="PTC Password:" />
-                          <Button fx:id="ptcLoginBtn" alignment="CENTER" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="25.0" prefWidth="111.0" text="Use PTC Auth" />
-                  <Separator />
-                  <Pane>
+<StackPane xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+	<children>
+		<StackPane prefHeight="0.0" prefWidth="0.0">
+			<children>
+				<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="10.0">
+					<children>
+						<HBox spacing="5">
+							<children>
+								<RadioButton fx:id="ptcRadio" selected="true" text="PTC" />
+								<RadioButton fx:id="googleRadio" text="Google Token" />
+                        		<RadioButton fx:id="googleAppRadio" layoutX="57.0" layoutY="10.0" text="Google App Pass" />
+							</children>
+						</HBox>
+						<Pane fx:id="ptcPane">
+							<children>
+								<TextField fx:id="usernameField" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="266.0" promptText="PTC Username:" />
+								<PasswordField fx:id="passwordField" layoutY="35.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="266.0" promptText="PTC Password:" />
+							</children>
+						</Pane>
+						<Separator prefWidth="200.0" />
+                  <HBox fx:id="googlePane" prefWidth="260.0" spacing="5.0">
                      <children>
-                        <TextField fx:id="tokenField" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="187.0" promptText="Google Auth Token:" />
-                        <Button fx:id="getTokenBtn" layoutX="198.0" mnemonicParsing="false" text="Get Token" />
+						<TextField fx:id="tokenField" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="25.0" promptText="Google Auth Token:" HBox.hgrow="ALWAYS" />
+						<Button fx:id="getTokenBtn" mnemonicParsing="false" prefWidth="80.0" text="Get Token" />
+                        <Button fx:id="helpGoogleBtn" text="?" />
+                     </children>
+                  </HBox>
+                  <Separator layoutX="10.0" layoutY="107.0" prefWidth="200.0" />
+                  <Pane fx:id="googleAppPane" layoutX="10.0" layoutY="37.0">
+                     <children>
+                        <TextField fx:id="googleUsernameField" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="243.0" promptText="Google Username:" />
+                        <PasswordField fx:id="googlePasswordField" layoutY="35.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="243.0" promptText="Google Password:" />
+                        <Button fx:id="helpGoogleAppBtn" layoutX="248.0" text="?" />
                      </children>
                   </Pane>
-                          <Button fx:id="googleAuthBtn" alignment="CENTER" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="25.0" prefWidth="111.0" text="Use Google Auth" />
-                        <CheckBox fx:id="saveAuthChkbx" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="17.0" prefWidth="147.0" text="Remember Credencials" />
-                    </children>
-                </VBox>
-            </children>
-        </StackPane>
-    </children>
-    <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-    </padding>
+						<AnchorPane>
+							<children>
+      							<Separator prefWidth="269.0" AnchorPane.topAnchor="10.0" />
+                        		<Label layoutY="24.0" text="Hash Key:" AnchorPane.topAnchor="24.0" />
+								<TextField fx:id="hashKeyField" layoutX="56.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="187.0" promptText="0123456789ABCDEFGHIJ" AnchorPane.topAnchor="20.0" />
+                        		<Button fx:id="helpBtn" layoutX="248.0" layoutY="20.0" text="?" AnchorPane.topAnchor="20.0" />
+								<CheckBox fx:id="saveAuthChkbx" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="17.0" prefWidth="147.0" text="Remember Credentials" AnchorPane.topAnchor="60.0" />
+								<Button fx:id="loginBtn" alignment="CENTER" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="25.0" prefWidth="111.0" text="ENTER" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="55.0" />
+							</children>
+						</AnchorPane>
+					</children>
+				</VBox>
+			</children>
+		</StackPane>
+	</children>
+	<padding>
+		<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+	</padding>
 </StackPane>

src/main/resources/version.txt

@@ -1 +1 @@
-v0.1.7-hotfix4
+v0.1.7-hotfix7

src/me/corriekay/pokegoutil/BlossomsPoGoManager.java

@@ -1,27 +1,31 @@
 package me.corriekay.pokegoutil;
 
+import java.awt.event.WindowAdapter;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
 import javafx.stage.Stage;
-import me.corriekay.pokegoutil.data.managers.AccountController;
 import me.corriekay.pokegoutil.data.managers.GlobalSettingsController;
-import me.corriekay.pokegoutil.gui.controller.ChooseGuiWindowController;
-import me.corriekay.pokegoutil.utils.ConfigKey;
-import me.corriekay.pokegoutil.utils.ConfigNew;
+import me.corriekay.pokegoutil.gui.controller.LoginController;
 import me.corriekay.pokegoutil.utils.StringLiterals;
+import me.corriekay.pokegoutil.utils.helpers.FileHelper;
 import me.corriekay.pokegoutil.utils.helpers.UIHelper;
 import me.corriekay.pokegoutil.utils.windows.WindowStuffHelper;
 
 /**
  * The main project class. Contains the runtime stuff.
  */
-public class BlossomsPoGoManager {
+public class BlossomsPoGoManager extends Application {
 
     private static Stage sPrimaryStage;
+    private static JFrame mainWindow;
 
     /**
      * Entry point of the application.
@@ -30,8 +34,7 @@ public class BlossomsPoGoManager {
      */
     public static void main(final String[] args) {
         GlobalSettingsController.setup();
-        //        launch(args);
-        new BlossomsPoGoManager().start(null);
+        launch(args);
     }
 
     /**
@@ -55,20 +58,52 @@ public static void setNewPrimaryStage(final Stage stage) {
         sPrimaryStage = stage;
     }
 
-    //    @Override
     /**
-     * Legacy start method from JavaFX nature. 
-     * @param primaryStage Received when have JavaFX nature
+     * Get the current main window.
+     *
+     * @return current main window
      */
-    public void start(final Stage primaryStage) {
-        setupGlobalExceptionHandling();
+    public static JFrame getMainWindow() {
+        return mainWindow;
+    }
 
-        if (ConfigNew.getConfig().getBool(ConfigKey.DEVELOPFLAG)) {
-            new ChooseGuiWindowController();
-            sPrimaryStage.show();
-        } else {
-            openOldGui();
+    /**
+     * Set the new main window.
+     *
+     * @param window main window
+     */
+    public static void setNewMainWindow(final JFrame window) {
+        if(BlossomsPoGoManager.mainWindow != null && BlossomsPoGoManager.mainWindow.isVisible()) {
+            BlossomsPoGoManager.mainWindow.setVisible(false);
         }
+        BlossomsPoGoManager.mainWindow = window;
+    }
+
+    @Override
+    public void start(final Stage primaryStage) {
+        setupGlobalExceptionHandling();
+        new LoginController();
+        SwingUtilities.invokeLater(() -> {
+            UIHelper.setNativeLookAndFeel();
+            JFrame frame = new JFrame();
+            final JFXPanel jfxPanel = new JFXPanel();
+            frame.getContentPane().add(jfxPanel);
+            frame.setSize(310, 370);
+            frame.setLocationRelativeTo(null);
+            frame.setIconImage(FileHelper.loadImage("icon/PokeBall-icon.png"));
+            frame.setTitle(BlossomsPoGoManager.getPrimaryStage().getTitle());
+            frame.setVisible(true);
+            setNewMainWindow(frame);
+            Platform.runLater(() -> {
+                jfxPanel.setScene(BlossomsPoGoManager.getPrimaryStage().getScene());
+                frame.addWindowListener(new WindowAdapter() {
+                    @Override
+                    public void windowClosing(java.awt.event.WindowEvent e) {
+                        Platform.runLater(() -> System.exit(0));
+                    }
+                });
+            });
+        });
     }
 
     /**
@@ -85,37 +120,33 @@ private static void setupGlobalExceptionHandling() {
                 result.add(current.getClass().getSimpleName() + StringLiterals.COLON_SEPARATOR + current.getLocalizedMessage());
                 current = current.getCause();
             }
-            SwingUtilities.invokeLater(() -> {
-                final String[] options = new String[] {"Continue anyway", "Exit"};
-                final int continueChoice = JOptionPane.showOptionDialog(
-                        WindowStuffHelper.ALWAYS_ON_TOP_PARENT,
-                        String.join(StringLiterals.NEWLINE, result)
-                        + StringLiterals.NEWLINE
-                        + StringLiterals.NEWLINE + "Application got a critical error."
-                        + StringLiterals.NEWLINE + "You can report the error on GitHub or Discord."
-                        + StringLiterals.NEWLINE
-                        + StringLiterals.NEWLINE + "It is possible to continue here, but do note that the application might not work as expected."
-                        + StringLiterals.NEWLINE + "Close and restart if that's the case.",
-                        "General Unhandled Error",
-                        JOptionPane.DEFAULT_OPTION,
-                        JOptionPane.ERROR_MESSAGE,
-                        null, options, options[0]);
-                if (continueChoice == 1) {
-                    // If exit is chosen, we exit here.
-                    System.exit(-1);
-                }
-            });
-        });
-    }
 
-    /**
-     * Opens the old GUI.
-     */
-    private void openOldGui() {
-        //        SwingUtilities.invokeLater(() -> {
-        UIHelper.setNativeLookAndFeel();
-        AccountController.initialize();
-        AccountController.logOn();
-        //        });
+            final String[] options = new String[] {"Continue anyway", "Exit"};
+            final int continueChoice = JOptionPane.showOptionDialog(
+                    WindowStuffHelper.ALWAYS_ON_TOP_PARENT,
+                    String.join(StringLiterals.NEWLINE, result)
+                    + StringLiterals.NEWLINE
+                    + StringLiterals.NEWLINE + "Application got a critical error."
+                    + StringLiterals.NEWLINE + "You can report the error on GitHub or Discord."
+                    + StringLiterals.NEWLINE
+                    + StringLiterals.NEWLINE + "It is possible to continue here, but do note that the application might not work as expected."
+                    + StringLiterals.NEWLINE + "Close and restart if that's the case.",
+                    "General Unhandled Error",
+                    JOptionPane.DEFAULT_OPTION,
+                    JOptionPane.ERROR_MESSAGE,
+                    null, options, options[0]);
+            if (continueChoice == 1) {
+                // If exit is chosen, we exit here.
+                System.exit(-1);
+            }
+        });
     }
+
+//    private void openOldGui() {
+//        SwingUtilities.invokeLater(() -> {
+//            UIHelper.setNativeLookAndFeel();
+//            AccountController.initialize();
+//            AccountController.logOn();
+//        });
+//    }
 }

src/me/corriekay/pokegoutil/data/enums/ColumnType.java

@@ -6,6 +6,8 @@
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
+import me.corriekay.pokegoutil.utils.ConfigKey;
+import me.corriekay.pokegoutil.utils.ConfigNew;
 import me.corriekay.pokegoutil.utils.StringLiterals;
 import me.corriekay.pokegoutil.utils.helpers.DateHelper;
 import me.corriekay.pokegoutil.utils.helpers.EvolveHelper;
@@ -63,6 +65,11 @@ public enum ColumnType {
         String.class,
         Comparators.STRING
     ),
+    NUMBER_STRING(
+        String.class,
+        Comparators.NUMBER_STRING,
+        CellRendererHelper.NUMBER_STRING
+    ),
     FUTURE_STRING(
         String.class,
         Comparators.FUTURE_STRING,
@@ -102,6 +109,40 @@ private static final class Comparators {
             }
             return Integer.compare(Integer.parseInt(left), Integer.parseInt(right));
         };
+        public static final Comparator<String> NUMBER_STRING = (left, right) -> {
+            // pre-initialize first split entries with "-1" so "-" (= NO_VALUE_SIGN) will be sorted separate from 0
+            String[] sLeft = {StringLiterals.MINUS_ONE, StringLiterals.MINUS_ONE};
+            String[] sRight = {StringLiterals.MINUS_ONE, StringLiterals.MINUS_ONE};
+            Integer iResult0 = 0;
+            Integer iResult1 = 0;
+
+            if (left.indexOf(StringLiterals.SLASH) > -1) {
+                sLeft = left.split(StringLiterals.SLASH);
+            }
+            if (right.indexOf(StringLiterals.SLASH) > -1) {
+                sRight = right.split(StringLiterals.SLASH);
+            }
+
+            iResult0 = Integer.compare(Integer.parseInt(sLeft[0]), Integer.parseInt(sRight[0]));
+            iResult1 = Integer.compare(Integer.parseInt(sLeft[1]), Integer.parseInt(sRight[1]));
+
+            final boolean useFullHP = ConfigNew.getConfig().getBool(ConfigKey.HP_SORT_ON_FULL);
+            final String sortEnum1 = ConfigNew.getConfig().getString(ConfigKey.SORT_ENUM_1);
+
+            if (useFullHP && "HP".equals(sortEnum1)) {
+                if (iResult1 == 0) { 
+                    return iResult0; 
+                } else { 
+                    return iResult1; 
+                }                              
+            } else {
+                if (iResult0 == 0) { 
+                    return iResult1;
+                } else {
+                    return iResult0;
+                }
+            }
+        };
     }
 
     /**