Merge branch 'task/kotlin_conversion' into 'master'

Provisioning app code converted to Kotlin

See merge request espressif/esp-idf-provisioning-android!82

Author: adwait-esp

app/build.gradle

@@ -12,14 +12,14 @@ def getGitHash = { ->
 
 android {
 
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     defaultConfig {
         applicationId "com.espressif.wifi_provisioning"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 27
-        versionName "2.3.1 - ${getGitHash()}"
+        versionCode 29
+        versionName "2.4.0 - ${getGitHash()}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-proguard-rules.pro"
     }
@@ -55,6 +55,15 @@ android {
         buildConfig = true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     namespace 'com.espressif.wifi_provisioning'
 }
 

app/src/main/java/com/espressif/AppConstants.java

@@ -0,0 +1,52 @@
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.espressif
+
+object AppConstants {
+    
+    // Keys used to pass data between activities and to store data in SharedPreference.
+    const val KEY_WIFI_SECURITY_TYPE: String = "wifi_security"
+    const val KEY_PROOF_OF_POSSESSION: String = "proof_of_possession"
+    const val KEY_WIFI_DEVICE_NAME_PREFIX: String = "wifi_network_name_prefix"
+    const val KEY_BLE_DEVICE_NAME_PREFIX: String = "ble_device_name_prefix"
+    const val KEY_DEVICE_NAME: String = "device_name"
+    const val KEY_STATUS_MSG: String = "status_msg"
+    const val KEY_WIFI_SSID: String = "ssid"
+    const val KEY_WIFI_PASSWORD: String = "password"
+    const val KEY_DEVICE_TYPES: String = "device_types"
+    const val KEY_SECURITY_TYPE: String = "security_type"
+    const val KEY_USER_NAME_WIFI: String = "sec2_username_wifi"
+    const val KEY_USER_NAME_THREAD: String = "sec2_username_thread"
+    const val KEY_THREAD_DATASET: String = "thread_dataset"
+    const val KEY_THREAD_SCAN_AVAILABLE: String = "thread_scan_available"
+
+    const val ESP_PREFERENCES: String = "Esp_Preferences"
+
+    const val DEVICE_TYPE_SOFTAP: String = "softap"
+    const val DEVICE_TYPE_BLE: String = "ble"
+    const val DEVICE_TYPE_BOTH: String = "both"
+    const val DEVICE_TYPE_DEFAULT: String = DEVICE_TYPE_BOTH
+
+    const val SEC_TYPE_0: Int = 0
+    const val SEC_TYPE_1: Int = 1
+    const val SEC_TYPE_2: Int = 2
+    const val SEC_TYPE_DEFAULT: Int = SEC_TYPE_2
+    const val DEFAULT_USER_NAME_WIFI: String = "wifiprov"
+    const val DEFAULT_USER_NAME_THREAD: String = "threadprov"
+
+    const val CAPABILITY_WIFI_SCAN: String = "wifi_scan"
+    const val CAPABILITY_THREAD_SCAN: String = "thread_scan"
+    const val CAPABILITY_THREAD_PROV: String = "thread_prov"
+}

app/src/main/java/com/espressif/AppConstants.kt

@@ -34,6 +34,7 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -339,12 +340,6 @@ class AddDeviceActivity : AppCompatActivity() {
         }
     }
 
-    private val cancelBtnClickListener = View.OnClickListener {
-        provisionManager.espDevice?.disconnectDevice()
-        setResult(RESULT_CANCELED, intent)
-        finish()
-    }
-
     private val btnGetPermissionClickListener = View.OnClickListener {
         buttonClicked = true
 
@@ -523,11 +518,7 @@ class AddDeviceActivity : AppCompatActivity() {
     }
 
     private fun initViews() {
-        binding.titleBar.mainToolbarTitle.setText(R.string.title_activity_add_device)
-        binding.titleBar.btnBack.visibility = View.GONE
-        binding.titleBar.btnCancel.visibility = View.VISIBLE
-        binding.titleBar.btnCancel.setOnClickListener(cancelBtnClickListener)
-
+        setToolbar()
         codeScanner = CodeScanner(this, binding.scannerView)
 
         binding.btnAddDeviceManually.textBtn.setText(R.string.btn_no_qr_code)
@@ -551,6 +542,20 @@ class AddDeviceActivity : AppCompatActivity() {
         }
     }
 
+    private fun setToolbar() {
+        setSupportActionBar(binding.titleBar.toolbar)
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        supportActionBar!!.setDisplayShowHomeEnabled(true)
+        supportActionBar!!.setTitle(R.string.title_activity_add_device)
+        binding.titleBar.toolbar.navigationIcon =
+            AppCompatResources.getDrawable(this, R.drawable.ic_arrow_left)
+        binding.titleBar.toolbar.setNavigationOnClickListener {
+            provisionManager.espDevice?.disconnectDevice()
+            setResult(RESULT_CANCELED, intent)
+            finish()
+        }
+    }
+
     private fun openCamera() {
 
         val isPlayServicesAvailable = Utils.isPlayServicesAvailable(applicationContext)