Added commands.

BeboKhouja · Jul 12, 2022 · bceccdf · bceccdf
1 parent 875c0eb
commit bceccdf
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 9 deletions.
diff --git a/bin/com/mokkachocolata/exception/JarNotFoundException.class b/bin/com/mokkachocolata/exception/JarNotFoundException.class
diff --git a/bin/com/mokkachocolata/project/adbgui/App.class b/bin/com/mokkachocolata/project/adbgui/App.class
diff --git a/bin/com/mokkachocolata/project/adbgui/MainFrame$ExceptionHandler.class b/bin/com/mokkachocolata/project/adbgui/MainFrame$ExceptionHandler.class
diff --git a/bin/com/mokkachocolata/project/adbgui/MainFrame.class b/bin/com/mokkachocolata/project/adbgui/MainFrame.class
diff --git a/bin/com/mokkachocolata/util/JarNotFoundException.class b/bin/com/mokkachocolata/util/JarNotFoundException.class
diff --git a/bin/com/mokkachocolata/util/Util.class b/bin/com/mokkachocolata/util/Util.class
diff --git a/...achocolata/util/JarNotFoundException.java → ...olata/exception/JarNotFoundException.java b/...achocolata/util/JarNotFoundException.java → ...olata/exception/JarNotFoundException.java
@@ -1,4 +1,4 @@
-package com.mokkachocolata.util;
+package com.mokkachocolata.exception;
 
 /**
  * Thrown when the Jar is not found.

diff --git a/src/com/mokkachocolata/project/adbgui/App.java b/src/com/mokkachocolata/project/adbgui/App.java
@@ -1,13 +1,18 @@
 package com.mokkachocolata.project.adbgui;
 
+import java.awt.Desktop;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Scanner;
 
+import com.mokkachocolata.exception.JarNotFoundException;
 import com.mokkachocolata.util.Terminal;
+import com.mokkachocolata.util.Util;
 
 public class App {
-    public static String version = "1.3";
-    public static void main(String[] args) throws IOException {
+    public static String version = "1.3.1";
+    public static void main(String[] args) throws IOException, URISyntaxException, JarNotFoundException {
         System.out.println("ADB GUI\nVersion ".concat(version));
         MainFrame myFrame = new MainFrame();
         myFrame.init();
@@ -22,6 +27,35 @@ public static void main(String[] args) throws IOException {
                         e.printStackTrace();
                     }}).start(); 
                     System.out.println("Execute command \"adb "+command+"\"");
+                    if (command.equals("version")) {
+                        System.out.println("ADB GUI version " + version);
+                    }
+                    if (command.equals("jarlocation")) {
+                        System.out.println(Util.getJarLocation());
+                    }
+                    if (command.equals("help")) {
+                        System.out.println("Handy commands:\n1. version\n2. jarlocation");
+                    }
+                    if (command.equals("github")) {
+                        if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                            try {
+                                Desktop.getDesktop().browse(new URI("https://github.com/BeboKhouja/ADB-GUI"));
+                            } catch (IOException | URISyntaxException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                    if (command.equals("discord")) {
+                        if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                            try {
+                                Desktop.getDesktop().browse(new URI("https://github.com/BeboKhouja/ADB-GUI"));
+                            } catch (IOException | URISyntaxException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            }
+                        }
+                    }
                 }
             }
 

diff --git a/src/com/mokkachocolata/project/adbgui/MainFrame.java b/src/com/mokkachocolata/project/adbgui/MainFrame.java
@@ -3,6 +3,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.security.KeyException;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -30,7 +31,7 @@ public class MainFrame extends JFrame implements ActionListener, MenuListener, K
     //Vars
     JMenuBar menubar1;
     JMenu filemenu1,advancedmenu1,helpmenu1;
-    JMenuItem exitmenu1,aboutmenu1,executecommandmenu2,discordmenu3;
+    JMenuItem exitmenu1,aboutmenu1,executecommandmenu2,discordmenu3,githubmenu3;
     JTextField edittext1;
     JButton button1,button2,button3,button4;
     JLabel text1;
@@ -64,6 +65,7 @@ public void init() {
         aboutmenu1 = new JMenuItem("About ADB GUI");
         executecommandmenu2 = new JMenuItem("Execute command");
         discordmenu3 = new JMenuItem("Discord Server");
+        githubmenu3 = new JMenuItem("GitHub Repository");
         button1 = new JButton("Reboot device"); 
         button2 = new JButton("Reboot to recovery");
         button3 = new JButton("Reboot to sideload");
@@ -86,10 +88,12 @@ public void init() {
         executecommandmenu2.setMnemonic(KeyEvent.VK_E);
         helpmenu1.setMnemonic(KeyEvent.VK_H);
         discordmenu3.setMnemonic(KeyEvent.VK_D);
+        githubmenu3.setMnemonic(KeyEvent.VK_G);
         filemenu1.add(aboutmenu1);
         filemenu1.add(exitmenu1);
         advancedmenu1.add(executecommandmenu2);
         helpmenu1.add(discordmenu3);
+        helpmenu1.add(githubmenu3);
         labelPanel.add(text1);
         buttonPanel.add(button1);
         buttonPanel.add(button2);
@@ -107,6 +111,7 @@ public void init() {
          exitmenu1.addActionListener(this);
          executecommandmenu2.addActionListener(this);
          discordmenu3.addActionListener(this);
+         githubmenu3.addActionListener(this);
          button1.addActionListener(this);
          button2.addActionListener(this);
          button3.addActionListener(this);
@@ -170,18 +175,28 @@ public void actionPerformed(ActionEvent arg0) {
             }
         } catch (IOException e) {
     }
+}
     if (arg0.getSource() == discordmenu3) {
+    if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+        try {
+            Desktop.getDesktop().browse(new URI("https://discord.gg/y6AcUNTKxX"));
+        } catch (IOException | URISyntaxException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}
+
+    if (arg0.getSource() == githubmenu3) {
         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
             try {
-                Desktop.getDesktop().browse(new URI("https://discord.gg/y6AcUNTKxX"));
+                Desktop.getDesktop().browse(new URI("https://github.com/BeboKhouja/ADB-GUI"));
             } catch (IOException | URISyntaxException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-        }
-    } else {
-    }}
-
+        }    
+    }
     }
 
     public void menuSelected(MenuEvent me) {

diff --git a/src/com/mokkachocolata/util/Util.java b/src/com/mokkachocolata/util/Util.java
@@ -2,6 +2,8 @@
 import java.io.File;
 import java.net.URISyntaxException;
 
+import com.mokkachocolata.exception.JarNotFoundException;
+
 public class Util {
     /**
 	 * Gets the downloaded JAR location.