Merge pull request #42 from spark/setup_step_bug

UI for step disconnecting from softAP
particle-iot · Mar 14, 2017 · 7f77764 · 7f77764
2 parents e9bff45 + 3db0107
commit 7f77764
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.4.2
+=====
+* UI for step disconnecting from softAP
+
 0.4.1
 =====
 * Device naming at the end of setup

diff --git a/devicesetup/build.gradle b/devicesetup/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'me.tatarka.retrolambda'
 
 // This is the library version used when deploying the artifact
-version = '0.4.1'
+version = '0.4.2'
 
 ext {
     bintrayRepo = 'android'

diff --git a/devicesetup/src/main/java/io/particle/android/sdk/devicesetup/ui/ConnectingActivity.java b/devicesetup/src/main/java/io/particle/android/sdk/devicesetup/ui/ConnectingActivity.java
@@ -194,7 +194,7 @@ private List<SetupStep> buildSteps() {
                 StepConfig.newBuilder()
                         .setMaxAttempts(MAX_RETRIES_DISCONNECT_FROM_DEVICE)
                         .setResultCode(SuccessActivity.RESULT_FAILURE_NO_DISCONNECT)
-                        .setStepId(R.id.connect_to_wifi_network)
+                        .setStepId(R.id.reconnect_to_wifi_network)
                         .build(),
                 deviceSoftApSsid, this);
 

diff --git a/devicesetup/src/main/res/layout/activity_connecting.xml b/devicesetup/src/main/res/layout/activity_connecting.xml
@@ -152,6 +152,43 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/reconnect_to_wifi_network"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal"
+                    android:visibility="invisible">
+
+                    <ProgressBar
+                        android:id="@+id/spinner"
+                        style="@style/SparkSpinner"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="left|center_vertical"
+                        android:layout_margin="0dp"
+                        android:visibility="visible"
+                        tools:ignore="DuplicateIds,RtlHardcoded"/>
+
+                    <ImageView
+                        android:id="@+id/checkbox"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="left|center_vertical"
+                        android:contentDescription="@null"
+                        android:src="@drawable/checkmark"
+                        android:visibility="gone"
+                        tools:ignore="DuplicateIds"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|center_vertical"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/reconnect_to_wifi_network"
+                        android:textSize="@dimen/text_size_small"/>
+
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/wait_for_device_cloud_connection"

diff --git a/devicesetup/src/main/res/values/strings.xml b/devicesetup/src/main/res/values/strings.xml
@@ -55,6 +55,7 @@
     <string name="no_wifi_networks_found">(No Wi-Fi networks found)</string>
     <string name="check_for_internet_connectivity">Checking for internet connectivity</string>
     <string name="connect_to_wifi_network">Connecting to Wi-Fi network</string>
+    <string name="reconnect_to_wifi_network">Disconnecting from softAP</string>
     <string name="configure_device_wifi_credentials">Configuring device Wi-Fi credentials</string>
     <string name="wait_for_device_cloud_connection">Waiting for device cloud connection</string>
     <string name="verify_product_ownership">Verifying product ownership</string>