Some bugs fixed, JDK update

rodion-gudz · Jun 18, 2021 · 10baab6 · 10baab6
1 parent 4fff519
commit 10baab6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.idea/artifacts/Android_Tool_jar.xml b/.idea/artifacts/Android_Tool_jar.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Android-Tool.iml b/Android-Tool.iml
@@ -21,8 +21,6 @@
     <orderEntry type="library" exported="" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" exported="" name="FlatLaf-library" level="project" />
     <orderEntry type="library" exported="" name="Maven-Artifact" level="project" />
-    <orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.0-native-mt" level="project" />
-    <orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0" level="project" />
-    <orderEntry type="library" name="Kotlinx-Coroutines-Swing" level="project" />
+    <orderEntry type="library" exported="" name="Kotlinx-Coroutines-Swing" level="project" />
   </component>
 </module>
diff --git a/src/AndroidTool.kt b/src/AndroidTool.kt
@@ -612,9 +612,10 @@ open class AndroidTool : Command() {
 			labelConnect.isVisible = true
 			labelIP.isVisible = true
 
+			appProp.load(AndroidTool::class.java.getResource("applist.properties").openStream())
+
 			frame.isVisible = true
 
-			appProp.load(AndroidTool::class.java.getResource("applist.properties").openStream())
 
 			DatagramSocket().use { socket ->
 				socket.connect(InetAddress.getByName("8.8.8.8"), 10002)

diff --git a/src/UI.kt b/src/UI.kt
@@ -964,7 +964,7 @@ open class AndroidToolUI {
 		radioButtonSilent.bounds = Rectangle(765, 436, 80, 20)
 		logsPanel.add(radioButtonSilent)
 		group.add(radioButtonSilent)
-		frame.setSize(1205, 615)
+		frame.setSize(1215, 615)
 		frame.defaultCloseOperation = JFrame.EXIT_ON_CLOSE
 		frame.layout = null
 		frame.isResizable = false
@@ -1076,7 +1076,7 @@ open class AndroidToolUI {
 		})
 		deviceConnection.add(textFieldIP)
 
-		tabbedpane.setBounds(320, 0, 895, 580)
+		tabbedpane.setBounds(320, 0, 905, 580)
 
 
 		logsPanel.layout = null