improved the window layout of 2fa and secret prompt windows

hyperdefined · hyperdefined · commit eff507508a19 · 2021-10-23T21:03:48.000-04:00
diff --git a/src/main/java/lol/hyper/customlauncher/accounts/windows/SecretPrompt.java b/src/main/java/lol/hyper/customlauncher/accounts/windows/SecretPrompt.java
@@ -23,12 +23,13 @@
 import lol.hyper.customlauncher.login.LoginRequest;
 
 import javax.swing.*;
+import java.awt.*;
 
 public class SecretPrompt extends JFrame {
 
     public SecretPrompt(String title, Account account) {
         JFrame frame = new JFrame(title);
-        frame.setSize(370, 150);
+        frame.setSize(170, 120);
         frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         frame.setResizable(false);
         try {
@@ -39,19 +40,18 @@ public SecretPrompt(String title, Account account) {
 
         // GUI elements
         JPanel panel = new JPanel();
-        panel.setLayout(null);
+        panel.setLayout(new GridBagLayout());
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridwidth = GridBagConstraints.REMAINDER;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
 
         JLabel secretLabel = new JLabel("Secret Phrase");
         JPasswordField secretText = new JPasswordField();
         JButton loginButton = new JButton("Login");
 
-        secretLabel.setBounds(50, 25, 100, 30);
-        secretText.setBounds(150, 25, 100, 30);
-        loginButton.setBounds(50, 75, 100, 30);
-
-        panel.add(secretLabel);
-        panel.add(secretText);
-        panel.add(loginButton);
+        panel.add(secretLabel, gbc);
+        panel.add(secretText, gbc);
+        panel.add(loginButton, gbc);
 
         // button listeners
         loginButton.addActionListener(event -> {
diff --git a/src/main/java/lol/hyper/customlauncher/login/windows/TwoFactorAuth.java b/src/main/java/lol/hyper/customlauncher/login/windows/TwoFactorAuth.java
@@ -29,7 +29,7 @@ public class TwoFactorAuth extends JFrame {
 
     public TwoFactorAuth(String title, String banner, String token) {
         JFrame frame = new JFrame(title);
-        frame.setSize(370, 200);
+        frame.setSize(230, 150);
         frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         frame.setResizable(false);
         try {
@@ -40,7 +40,10 @@ public TwoFactorAuth(String title, String banner, String token) {
 
         // GUI elements
         JPanel panel = new JPanel();
-        panel.setLayout(null);
+        panel.setLayout(new GridBagLayout());
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridwidth = GridBagConstraints.REMAINDER;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
 
         JLabel text = new JLabel("<html>" + banner + "</html>");
         JTextField userAuthCode = new JTextField();
@@ -58,14 +61,9 @@ public void keyTyped(KeyEvent e) {
 
         JButton loginButton = new JButton("Submit");
 
-        userAuthCode.setMaximumSize(new Dimension(50, 25));
-        text.setBounds(30, 15, 300, 30);
-        userAuthCode.setBounds(30, 50, 70, 30);
-        loginButton.setBounds(30, 85, 100, 30);
-
-        panel.add(text);
-        panel.add(userAuthCode);
-        panel.add(loginButton);
+        panel.add(text, gbc);
+        panel.add(userAuthCode, gbc);
+        panel.add(loginButton, gbc);
 
         // button listeners
         loginButton.addActionListener(event -> {
