From b841c4b4c94a8256a62afea2839ae3606ae53c7c Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@ivt.com.au>
Date: Sun, 3 Aug 2014 22:45:03 +0930
Subject: [PATCH] Remove public/private/hotspot icons (Fixes issue #9)

These have been temoprarily moved to an unused layout. The reason
it wasn't removed completely was because the layout still adheres
to the spec from carrie (and I couldn't be bothered looking through
the git history to find it later on when it is time to re-implement
it :)

I've also commented out the "Learn more about wifi" and "use
bluetooth instead" buttons for now.
---
 res/layout/swap_join_wifi.xml        | 149 ++++-----------------------
 res/layout/swap_learn_about_wifi.xml | 114 ++++++++++++++++++++
 2 files changed, 134 insertions(+), 129 deletions(-)
 create mode 100644 res/layout/swap_learn_about_wifi.xml

diff --git a/res/layout/swap_join_wifi.xml b/res/layout/swap_join_wifi.xml
index 1bf1110d8..b59f544d1 100644
--- a/res/layout/swap_join_wifi.xml
+++ b/res/layout/swap_join_wifi.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              xmlns:tools="http://schemas.android.com/tools"
-              tools:context=".views.swap.SwapActivity">
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".views.swap.SwapActivity">
 
     <TextView
             android:layout_width="wrap_content"
@@ -23,9 +23,9 @@
             android:id="@+id/wifi_icon"
             android:src="@drawable/wifi"
             android:layout_below="@+id/text_description"
-            android:layout_centerHorizontal="true"
-            android:layout_above="@+id/wifi_ssid"/>
+            android:layout_centerHorizontal="true" />
 
+    <!--
     <Button style="@style/SwapTheme.Wizard.OptionButton"
             android:id="@+id/btn_bluetooth"
             android:text="@string/swap_use_bluetooth"
@@ -35,127 +35,7 @@
             android:text="@string/swap_wifi_help"
             android:layout_above="@id/btn_bluetooth"
             android:id="@+id/btn_learn_more_about_wifi"/>
-
-    <LinearLayout
-            android:id="@+id/wifi_type_descriptions"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/btn_learn_more_about_wifi"
-            android:layout_centerHorizontal="true"
-            android:gravity="bottom"
-            android:paddingBottom="20dp"
-            android:paddingTop="20dp">
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_marginRight="10dp">
-
-            <ImageView
-                    android:id="@+id/wifi_icon_public"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/wifi_ap_public"/>
-
-            <TextView
-                    android:id="@+id/wifi_label_public"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Public"/>
-
-            <TextView
-                    android:id="@+id/wifi_warning_public"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="May work"/>
-            
-            <ImageView
-                    android:id="@+id/wifi_status_public"
-                    android:src="@drawable/swap_wifi_may_work"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_marginRight="10dp"
-                android:layout_marginLeft="10dp">
-
-            <ImageView
-                    android:id="@+id/wifi_icon_private"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/wifi_ap_private" />
-
-            <TextView
-                    android:id="@+id/wifi_label_private"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Private" />
-
-            <TextView
-                    android:id="@+id/wifi_warning_private"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Promising" />
-            
-            <ImageView
-                    android:id="@+id/wifi_status_private"
-                    android:src="@drawable/swap_wifi_likely_to_work"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_marginLeft="10dp">
-
-            <ImageView
-                    android:id="@+id/wifi_icon_personal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/wifi_ap_personal" />
-
-            <TextView
-                    android:id="@+id/wifi_label_personal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Hotspot" />
-
-            <TextView
-                    android:id="@+id/wifi_warning_personal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Best bet" />
-            
-            <ImageView
-                    android:id="@+id/wifi_status_personal"
-                    android:src="@drawable/swap_wifi_likely_to_work"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/swap_view_available_networks"
-            android:id="@+id/wifi_available_networks_prompt"
-            android:layout_above="@id/wifi_type_descriptions"
-            android:layout_centerHorizontal="true" />
+    -->
 
     <TextView
             android:layout_width="wrap_content"
@@ -163,7 +43,18 @@
             tools:text="No network yet"
             android:id="@+id/wifi_ssid"
             style="@style/SwapTheme.Wizard.WifiSSID"
-            android:layout_above="@id/wifi_available_networks_prompt"
+            android:layout_below="@id/wifi_icon"
             android:layout_centerHorizontal="true" />
+    <!--android:layout_above="@id/wifi_available_networks_prompt"-->
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/swap_view_available_networks"
+            android:id="@+id/wifi_available_networks_prompt"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@id/wifi_ssid"
+            android:paddingBottom="20dp"/>
+    <!-- android:layout_above="@id/btn_learn_more_about_wifi" -->
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/swap_learn_about_wifi.xml b/res/layout/swap_learn_about_wifi.xml
new file mode 100644
index 000000000..511091ef5
--- /dev/null
+++ b/res/layout/swap_learn_about_wifi.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:gravity="bottom"
+        android:paddingBottom="20dp"
+        android:paddingTop="20dp"
+        tools:context=".views.swap.SwapActivity">
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginRight="10dp">
+
+        <ImageView
+                android:id="@+id/wifi_icon_public"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/wifi_ap_public"/>
+
+        <TextView
+                android:id="@+id/wifi_label_public"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Public"/>
+
+        <TextView
+                android:id="@+id/wifi_warning_public"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="May work"/>
+
+        <ImageView
+                android:id="@+id/wifi_status_public"
+                android:src="@drawable/swap_wifi_may_work"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="10dp">
+
+        <ImageView
+                android:id="@+id/wifi_icon_private"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/wifi_ap_private" />
+
+        <TextView
+                android:id="@+id/wifi_label_private"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Private" />
+
+        <TextView
+                android:id="@+id/wifi_warning_private"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Promising" />
+
+        <ImageView
+                android:id="@+id/wifi_status_private"
+                android:src="@drawable/swap_wifi_likely_to_work"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginLeft="10dp">
+
+        <ImageView
+                android:id="@+id/wifi_icon_personal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/wifi_ap_personal" />
+
+        <TextView
+                android:id="@+id/wifi_label_personal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Hotspot" />
+
+        <TextView
+                android:id="@+id/wifi_warning_personal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Best bet" />
+
+        <ImageView
+                android:id="@+id/wifi_status_personal"
+                android:src="@drawable/swap_wifi_likely_to_work"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file