Merge branch 'bugfix/softap_connection' into 'master'

Improved SoftAP connection workflow and QR code scanning

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

Author: shahpiyushv

app/build.gradle

@@ -1,15 +1,24 @@
 apply plugin: 'com.android.application'
 
+def getGitHash = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
 android {
 
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.espressif.wifi_provisioning"
-        minSdkVersion 24
-        targetSdkVersion 28
+        minSdkVersion 23
+        targetSdkVersion 29
         versionCode 6
-        versionName "2.0"
+        versionName "2.0.1 - ${getGitHash()}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -22,8 +31,9 @@ android {
             resValue "string", "wifi_base_url", "192.168.4.1:80"
             resValue "string", "wifi_device_name_prefix", "PROV_"
             resValue "string", "ble_device_name_prefix", "PROV_"
-            buildConfigField "boolean", "IS_QR_CODE_SUPPORTED", "true"
-            buildConfigField "boolean", "IS_ALLOWED_FILTERING_BY_PREFIX", "true"
+            buildConfigField "boolean", "isQrCodeSupported", "true"
+            buildConfigField "boolean", "isSettingsAllowed", "true"
+            buildConfigField "boolean", "isFilteringByPrefixAllowed", "true"
         }
 
         debug {
@@ -32,8 +42,9 @@ android {
             resValue "string", "wifi_base_url", "192.168.4.1:80"
             resValue "string", "wifi_device_name_prefix", "PROV_"
             resValue "string", "ble_device_name_prefix", "PROV_"
-            buildConfigField "boolean", "IS_QR_CODE_SUPPORTED", "true"
-            buildConfigField "boolean", "IS_ALLOWED_FILTERING_BY_PREFIX", "true"
+            buildConfigField "boolean", "isQrCodeSupported", "true"
+            buildConfigField "boolean", "isSettingsAllowed", "true"
+            buildConfigField "boolean", "isFilteringByPrefixAllowed", "true"
         }
     }
 }
@@ -43,14 +54,16 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.wang.avi:library:2.1.3'
-    implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'androidx.preference:preference:1.1.1'
 
     implementation 'com.google.protobuf:protobuf-lite:3.0.1'
     implementation 'com.google.crypto.tink:tink-android:1.1.0'
     implementation project(path: ':provisioning')
 
+    implementation 'com.wang.avi:library:2.1.3'
+    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'com.budiyev.android:code-scanner:2.1.0'
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/ble/res/drawable/ic_launcher_background.xml

@@ -12,12 +12,12 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
@@ -44,8 +44,8 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name="com.espressif.ui.activities.WiFiProvisionLanding"
-            android:label="@string/title_activity_provision_landing"
+            android:name="com.espressif.ui.activities.WiFiConfigActivity"
+            android:label="@string/title_activity_wifi_config"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity

app/src/ble/res/drawable/ic_launcher_foreground.xml

@@ -26,10 +26,12 @@ public class AppConstants {
     public static final String KEY_WIFI_SSID = "ssid";
     public static final String KEY_WIFI_PASSWORD = "password";
     public static final String KEY_DEVICE_TYPES = "device_types";
+    public static final String KEY_SECURITY_TYPE = "security_type";
 
     public static final String ESP_PREFERENCES = "Esp_Preferences";
 
-    public static final String DEVICE_TYPE_WIFI = "wifi";
+    public static final String DEVICE_TYPE_SOFTAP = "wifi";
     public static final String DEVICE_TYPE_BLE = "ble";
     public static final String DEVICE_TYPE_BOTH = "both";
+    public static final String DEVICE_TYPE_DEFAULT = DEVICE_TYPE_BOTH;
 }