1 files changed, 64 insertions, 23 deletions

diff --git a/app/res/layout/activity_main.xml b/app/res/layout/activity_main.xml
index b9359ba..41f6367 100644
--- a/app/res/layout/activity_main.xml
+++ b/app/res/layout/activity_main.xml
@@ -4,25 +4,75 @@
     android:background="@color/black"
     android:padding="15dp" >
 
-    <TextView
-        android:id="@+id/txt_main"
-        android:layout_width="fill_parent"
+    <RelativeLayout
+        android:id="@+id/top_frame"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:background="@color/black"
-        android:maxLines="10"
-        android:text=""
-        android:textColor="@color/ThemeLight" />
+        android:background="@drawable/top_frame"
+        android:orientation="vertical"
+        android:padding="10dp" >
+        
+       <TextView
+            android:id="@+id/txt_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:background="#80000000"
+            android:textColor="@color/ThemeLight"
+            android:textIsSelectable="true"
+            android:layout_marginTop="10dp"
+			android:layout_marginBottom="10dp" />
+        
+       <ImageView
+            android:id="@+id/img_logo"
+            android:layout_below="@id/txt_status"
+           	android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_margin="5dp"
+            android:paddingRight="5dp"
+            android:contentDescription="repwifi_logo" >
+        </ImageView>
+
+         <Button
+            android:id="@+id/btn_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp"
+            android:layout_toRightOf="@id/img_logo"
+            android:layout_below="@id/txt_status"
+            android:background="@drawable/repwifi_button"
+            android:onClick="onBtnInfoClick"
+            android:text="@string/text_connection_info"
+            android:textColor="@color/ThemeLight"
+            android:paddingTop="0dp"
+            android:paddingBottom="0dp" />
+
+        <Button
+            android:id="@+id/btn_disconnect"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp"
+            android:layout_below="@id/btn_info"
+            android:layout_toRightOf="@id/img_logo"
+            android:background="@drawable/repwifi_button"
+            android:onClick="onBtnDisconnectClick"
+            android:text="@string/disconnect"
+            android:textColor="@color/ThemeLight" />
+
+    </RelativeLayout>
+
 
     <Button
+        android:layout_below="@id/top_frame"
         android:id="@+id/btn_scan"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        android:layout_marginTop="20dp"
         android:background="@drawable/repwifi_button"
         android:onClick="btnScanClick"
         android:paddingLeft="5dp"
@@ -36,21 +86,21 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/btn_scan"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
+        android:layout_marginBottom="15dp"
         android:background="@drawable/repwifi_button"
         android:onClick="btnHiddenClick"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
         android:text="@string/connect_hidden"
         android:textColor="@color/ThemeLight" />
-    
+
     <Button
         android:id="@+id/btn_manage_nets"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/btn_hidden_ssid"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
+        android:layout_marginBottom="15dp"
         android:background="@drawable/repwifi_button"
         android:onClick="btnManageClick"
         android:paddingLeft="5dp"
@@ -58,13 +108,4 @@
         android:text="@string/manage_networks"
         android:textColor="@color/ThemeLight" />
 
-    <ImageView
-        android:id="@+id/img_logo"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/btn_manage_nets"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="20dp" >
-    </ImageView>
-
 </RelativeLayout>
\ No newline at end of file