From 10baab6cb7bdb62fd3405361b591c4481f9174ad Mon Sep 17 00:00:00 2001
From: lavender <rodiongudz.services@gmail.com>
Date: Fri, 18 Jun 2021 12:47:13 +0300
Subject: [PATCH] Some bugs fixed, JDK update

---
 .idea/artifacts/Android_Tool_jar.xml | 2 +-
 .idea/misc.xml                       | 2 +-
 Android-Tool.iml                     | 4 +---
 src/AndroidTool.kt                   | 3 ++-
 src/UI.kt                            | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.idea/artifacts/Android_Tool_jar.xml b/.idea/artifacts/Android_Tool_jar.xml
index 6479c38..f88fb74 100644
--- a/.idea/artifacts/Android_Tool_jar.xml
+++ b/.idea/artifacts/Android_Tool_jar.xml
@@ -15,10 +15,10 @@
       <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-test.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/formdev/flatlaf/1.2/flatlaf-1.2.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/maven-artifact-3.8.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/plexus-utils-3.2.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-lang3-3.8.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/formdev/flatlaf/1.2/flatlaf-1.2.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9099e93..71789c5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="OpenJDK-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="azul-16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressABINotification">
diff --git a/Android-Tool.iml b/Android-Tool.iml
index b7e0134..8c009de 100644
--- 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>
\ No newline at end of file
diff --git a/src/AndroidTool.kt b/src/AndroidTool.kt
index 7bbaa20..1f9e621 100644
--- 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
index 8bbf5fb..c60726f 100644
--- 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