Merge branch 'feature/avs-ble-cosmetic-changes' into 'versions/avs-ble'

UI Improvements

See merge request idf/esp-idf-provisioning-android!17

Author: KhushbuShah25

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.espressif.provbleavs"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 7
-        versionName "1.3.2"
+        versionCode 8
+        versionName "1.3.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.config
     }

app/src/main/java/com/espressif/ble_scanner/BleScanListener.java app/src/main/java/com/espressif/ble_scanner/BLEScanListener.java

@@ -6,7 +6,7 @@
 /**
  * Interface for BLE device scanning.
  */
-public interface BleScanListener {
+public interface BLEScanListener {
 
     /**
      * Called when any BLE peripheral will be found.

app/src/main/java/com/espressif/ble_scanner/BleScanner.java app/src/main/java/com/espressif/ble_scanner/BLEScanner.java

@@ -15,19 +15,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class BleScanner {
+public class BLEScanner {
 
-    private static final String TAG = BleScanner.class.getSimpleName();
+    private static final String TAG = BLEScanner.class.getSimpleName();
 
     private Context context;
-    private BleScanListener bleScanListener;
+    private BLEScanListener bleScanListener;
     private BluetoothAdapter bluetoothAdapter;
     private BluetoothLeScanner bluetoothLeScanner;
 
     private long scanTimeout;
     private boolean isScanning = false;
 
-    public BleScanner(Context context, long scanTimeoutInMillis, BleScanListener bleScannerListener) {
+    public BLEScanner(Context context, long scanTimeoutInMillis, BLEScanListener bleScannerListener) {
 
         this.context = context;
         this.scanTimeout = scanTimeoutInMillis;

app/src/main/java/com/espressif/ui/activities/BLEProvisionLanding.java

@@ -41,8 +41,8 @@
 
 import com.espressif.AppConstants;
 import com.espressif.avs.ConfigureAVS;
-import com.espressif.ble_scanner.BleScanListener;
-import com.espressif.ble_scanner.BleScanner;
+import com.espressif.ble_scanner.BLEScanListener;
+import com.espressif.ble_scanner.BLEScanner;
 import com.espressif.provision.Provision;
 import com.espressif.provision.R;
 import com.espressif.provision.security.Security;
@@ -100,7 +100,7 @@ public class BLEProvisionLanding extends AppCompatActivity {
 
     private BleDeviceListAdapter adapter;
     private BluetoothAdapter bleAdapter;
-    private BleScanner bleScanner;
+    private BLEScanner bleScanner;
     private ArrayList<BluetoothDevice> deviceList;
     private HashMap<BluetoothDevice, String> bluetoothDevices;
     private Handler handler;
@@ -145,7 +145,7 @@ protected void onCreate(Bundle savedInstanceState) {
         deviceList = new ArrayList<>(keySet);
 
         initViews();
-        bleScanner = new BleScanner(this, SCAN_TIMEOUT, bleScanListener);
+        bleScanner = new BLEScanner(this, SCAN_TIMEOUT, bleScanListener);
 
         transportListener = new BLETransport.BLETransportListener() {
 
@@ -382,17 +382,12 @@ private void updateProgressAndScanBtn() {
 
         if (bleScanner.isScanning()) {
 
-//            btnScan.setEnabled(false);
-//            btnScan.setAlpha(0.5f);
-//            btnScan.setTextColor(Color.WHITE);
             btnScan.setVisibility(View.GONE);
             progressBar.setVisibility(View.VISIBLE);
             listView.setVisibility(View.GONE);
 
         } else {
 
-//            btnScan.setEnabled(true);
-//            btnScan.setAlpha(1f);
             btnScan.setVisibility(View.VISIBLE);
             progressBar.setVisibility(View.GONE);
             listView.setVisibility(View.VISIBLE);
@@ -534,7 +529,7 @@ public void onClick(DialogInterface dialog, int which) {
         builder.show();
     }
 
-    private BleScanListener bleScanListener = new BleScanListener() {
+    private BLEScanListener bleScanListener = new BLEScanListener() {
 
         @Override
         public void onPeripheralFound(BluetoothDevice device, ScanResult scanResult) {
@@ -596,10 +591,10 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
             isDeviceConnected = false;
             btnScan.setVisibility(View.GONE);
             listView.setVisibility(View.GONE);
-            progressBar.setVisibility(View.VISIBLE);
             BluetoothDevice device = adapter.getItem(position);
             deviceName = device.getName();
             Log.d(TAG, "=================== Connect to device : " + deviceName);
+            progressBar.setVisibility(View.VISIBLE);
             bleTransport.connect(device);
             handler.postDelayed(disconnectDeviceTask, DEVICE_CONNECT_TIMEOUT);
         }

app/src/main/java/com/espressif/ui/adapters/WiFiListAdapter.java

@@ -46,6 +46,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
 //            lockImage.setVisibility(View.VISIBLE);
 //        }
 
+        if (wiFiAccessPoint.getWifiName().equals(context.getString(R.string.join_other_network))) {
+
+            rssiImage.setVisibility(View.VISIBLE);
+            rssiImage.setImageResource(R.drawable.ic_right_arrow);
+        }
+
         return view;
     }
 

app/src/main/res/drawable/ic_refresh.xml

@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="512"
-    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M384,352l96,-109.3h-66.1C407.1,141.8 325,64 223.2,64C117.8,64 32,150.1 32,256s85.8,192 191.2,192c43.1,0 83.8,-14.1 117.7,-40.7l7.5,-5.9l-43.2,-46.2l-6.2,4.6c-22.1,16.3 -48.3,24.9 -75.8,24.9C152.6,384.7 95.1,327 95.1,256c0,-71 57.5,-128.7 128.1,-128.7c66.4,0 120.7,50 127.4,115.3h-74.1L384,352z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="27.125"
+    android:viewportHeight="27.43">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M27.094,12.945c-1.511,0.013 -3.021,0.021 -4.531,0.034c0.254,2.6 -0.603,5.287 -2.594,7.275c-3.535,3.534 -9.263,3.534 -12.796,0c-3.534,-3.531 -3.534,-9.26 0,-12.794c3.015,-3.016 7.625,-3.445 11.109,-1.313c-1.181,1.167 -2.57,2.549 -2.57,2.549c-1,1.062 0.017,1.766 0.69,1.77h8.828c0.338,0 0.61,-0.273 0.611,-0.611V1.099c0.041,-0.825 -0.865,-1.592 -1.756,-0.7c0,0 -1.495,1.479 -2.533,2.509C16.246,-0.97 8.768,-0.53 3.975,4.262c-5.3,5.3 -5.3,13.893 0,19.192c5.299,5.298 13.892,5.298 19.191,0C26.05,20.572 27.35,16.714 27.094,12.945z" />
 </vector>

app/src/main/res/drawable/ic_right_arrow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M160,115.4l20.7,-19.4l171.3,160l-171.3,160l-20.7,-19.3l150.5,-140.7z" />
+</vector>

app/src/main/res/layout/content_bleprovision_landing.xml

@@ -35,6 +35,7 @@
             android:layout_height="wrap_content"
             android:text="@string/devices_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textSize="20sp"
             android:textStyle="bold" />
 
         <ImageView

app/src/main/res/layout/content_manage_devices.xml

@@ -35,6 +35,7 @@
             android:layout_height="wrap_content"
             android:text="@string/devices_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textSize="20sp"
             android:textStyle="bold" />
 
         <ImageView
@@ -57,11 +58,7 @@
             android:id="@+id/connected_devices_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            android:layout_alignParentBottom="true" />
 
         <LinearLayout
             android:layout_width="wrap_content"

app/src/main/res/layout/content_wifi_scan_list.xml

@@ -33,7 +33,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/networks"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
         <ImageView
             android:id="@+id/btn_refresh"

app/src/main/res/layout/item_wifi_access_point.xml

@@ -7,14 +7,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:padding="10dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tv_wifi_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="10dp" />
+            android:layout_marginStart="10dp"
+            android:textSize="18sp" />
 
         <ImageView
             android:id="@+id/iv_wifi_rssi"