From 317e040e1be35317569982853fdb6e67605e736d Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 27 Jun 2020 13:10:10 -0700
Subject: [PATCH] 1. old core fix, clipboard fix, GUI fix

---
 .../chronosx88/yggdrasil/MainActivity.kt      |  4 +-
 app/src/main/res/layout/activity_main.xml     | 46 ++++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 60b4e3c..2dbf6ed 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -72,11 +72,11 @@ class MainActivity : AppCompatActivity() {
 
         val copyAddressButton = findViewById<Button>(R.id.copyIp)
         copyAddressButton.setOnClickListener {
-            val ipLabel = findViewById<TextView>(R.id.ipLabel)
+            val ip = findViewById<TextView>(R.id.ip)
             val clipboard: ClipboardManager =
                 getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip =
-                ClipData.newPlainText("IP address", ipLabel.text.toString())
+                ClipData.newPlainText("IP address", ip.text.toString())
             clipboard.setPrimaryClip(clip)
             showToast(getString(R.string.address_copied))
         }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 910d64c..26e797c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,23 +17,34 @@
             android:paddingLeft="20dp"
             android:orientation="vertical"
             app:layout_constraintTop_toTopOf="parent"
-            android:animateLayoutChanges="true"
-            android:visibility="gone">
-
-        <TextView
-                android:id="@+id/ipLabel"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:background="@android:color/transparent"
-                android:elevation="8dp"
-                android:gravity="center_vertical"
-                android:text="IP address:"
-                android:textColor="@color/dark_30" />
-
+            android:animateLayoutChanges="true">
         <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toTopOf="parent">
+            <TextView
+                    android:id="@+id/ipLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:background="@android:color/transparent"
+                    android:elevation="8dp"
+                    android:gravity="center_vertical"
+                    android:text="IP address:"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                android:textColor="@color/dark_30" />
+
+            <Button
+                    android:id="@+id/copyIp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="COPY"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:background="@android:color/transparent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
             <TextView
                     android:id="@+id/ip"
                     android:layout_width="match_parent"
@@ -47,15 +58,6 @@
                     app:layout_constraintEnd_toStartOf="@+id/copyIp"
                     android:text=""
                     android:textColor="@color/white"/>
-            <Button
-                    android:id="@+id/copyIp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="COPY"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    android:background="@android:color/transparent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </LinearLayout>