From 1f1c853647121ce4fc4d5a43481cf06b82c4fd46 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 17:46:33 +0200
Subject: [PATCH 001/126] chore: update fastlane

---
 Gemfile.lock | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7a0078bc..382d34e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,21 +3,21 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.725.0)
-    aws-sdk-core (3.170.0)
+    aws-partitions (1.763.0)
+    aws-sdk-core (3.172.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
+    aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.1)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.212.1)
+    fastlane (2.212.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -107,7 +107,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.5.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.35.0)
+    google-apis-androidpublisher_v3 (0.42.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -138,7 +138,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -194,7 +194,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unf_ext (0.0.8.2-x64-mingw32)
     unicode-display_width (1.8.0)
     webrick (1.8.1)
     word_wrap (1.0.0)

From fe91b0750cb5337162ad9f2ff209ced9667fed3d Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 17:47:08 +0200
Subject: [PATCH 002/126] refactor: use kotlin flow instead of live data to
 update the terminal output

---
 .../org/kabiri/android/usbterminal/MainActivity.kt    | 11 +++++++----
 .../usbterminal/viewmodel/MainActivityViewModel.kt    |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index a3111b18..c6faf140 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -12,6 +12,7 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
@@ -51,10 +52,12 @@ class MainActivity : AppCompatActivity() {
             )
         }
 
-        viewModel.output.observe(this) {
-            tvOutput.apply {
-                text = it
-                scrollToLastLine()
+        lifecycleScope.launchWhenResumed {
+            viewModel.output.collect {
+                tvOutput.apply {
+                    text = it
+                    scrollToLastLine()
+                }
             }
         }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 575ab12a..64a668e6 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -3,6 +3,8 @@ package org.kabiri.android.usbterminal.viewmodel
 import android.hardware.usb.UsbDevice
 import androidx.lifecycle.*
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import org.kabiri.android.usbterminal.model.OutputText
@@ -17,8 +19,9 @@ class MainActivityViewModel
     private val arduinoHelper: ArduinoHelper,
 ): ViewModel() {
 
-    private val _outputLive = MutableLiveData("")
-    val output = _outputLive
+    private val _outputLive = MutableStateFlow("")
+    val output: StateFlow<String>
+        get() = _outputLive
 
     fun askForConnectionPermission() = arduinoHelper.askForConnectionPermission()
 

From 910575d9f380991c28f64f0c60abb4d675beb1c7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 18:44:44 +0200
Subject: [PATCH 003/126] refactor: replace live data with kotlin flows

---
 .../android/usbterminal/MainActivity.kt       |  18 +--
 .../usbterminal/arduino/ArduinoHelper.kt      | 103 ++++++++----------
 .../ArduinoPermissionBroadcastReceiver.kt     |  26 +++--
 .../arduino/ArduinoSerialReceiver.kt          |  22 ++--
 .../viewmodel/MainActivityViewModel.kt        |  31 ++++--
 5 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index c6faf140..44607fe1 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -42,14 +42,16 @@ class MainActivity : AppCompatActivity() {
             viewModel.openDeviceAndPort(device)
         }
 
-        viewModel.getLiveOutput().observe(this) {
-            val spannable = SpannableString(it.text)
-            spannable.setSpan(
-                it.getAppearance(this),
-                0,
-                it.text.length,
-                SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
+        lifecycleScope.launchWhenResumed {
+            viewModel.getLiveOutput().collect {
+                val spannable = SpannableString(it.text)
+                spannable.setSpan(
+                    it.getAppearance(this@MainActivity),
+                    0,
+                    it.text.length,
+                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
         }
 
         lifecycleScope.launchWhenResumed {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 27830246..b0649df4 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -8,11 +8,11 @@ import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
 import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
 import com.felhr.usbserial.UsbSerialDevice
 import com.felhr.usbserial.UsbSerialInterface
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
 import javax.inject.Inject
@@ -37,9 +37,9 @@ class ArduinoHelper
         private const val TAG = "ArduinoHelper"
     }
 
-    private val _liveOutput = MutableLiveData<String>()
-    private val _liveInfoOutput = MutableLiveData<String>()
-    private val _liveErrorOutput = MutableLiveData<String>()
+    private val _liveOutput = MutableStateFlow("")
+    private val _liveInfoOutput = MutableStateFlow("")
+    private val _liveErrorOutput = MutableStateFlow("")
 
     private var usbManager: UsbManager = context.getSystemService(Context.USB_SERVICE) as UsbManager
     private lateinit var connection: UsbDeviceConnection
@@ -50,41 +50,39 @@ class ArduinoHelper
      */
     fun askForConnectionPermission() {
         val usbDevices = usbManager.deviceList
-        _liveInfoOutput.postValue(context.getString(R.string.helper_info_checking_attached_usb_devices))
+        _liveInfoOutput.value =
+            context.getString(R.string.helper_info_checking_attached_usb_devices)
         if (usbDevices.isNotEmpty()) {
             for (device in usbDevices) {
                 val deviceVID = device.value.vendorId
                 if (deviceVID == 0x2341) { // Arduino vendor ID
                     connect(device)
                 } else {
-                    _liveErrorOutput.postValue(context.getString(R.string.helper_error_device_not_found))
-                    _liveErrorOutput.postValue(context.getString(R.string.helper_error_connecting_anyway))
+                    _liveErrorOutput.value =
+                        context.getString(R.string.helper_error_device_not_found)
+                    _liveErrorOutput.value = context.getString(R.string.helper_error_connecting_anyway)
                     connect(device)
                 }
             }
         } else {
-            _liveErrorOutput.postValue(context.getString(R.string.helper_error_usb_devices_not_attached))
+            _liveErrorOutput.value = context.getString(R.string.helper_error_usb_devices_not_attached)
         }
     }
 
     fun disconnect() {
         try {
             connection.close()
-            _liveOutput.postValue(context.getString(R.string.helper_info_serial_connection_closed))
+            _liveOutput.value = context.getString(R.string.helper_info_serial_connection_closed)
         } catch (e: UninitializedPropertyAccessException) {
-            _liveErrorOutput.postValue(
-                context.getString(
-                    R.string.helper_error_connection_not_ready_to_close
-                )
-            )
-            _liveErrorOutput.postValue("${e.localizedMessage}\n")
+            _liveErrorOutput.value =
+                context.getString(R.string.helper_error_connection_not_ready_to_close)
+
+            _liveErrorOutput.value = "${e.localizedMessage}\n"
         } catch (e: Exception) {
-            _liveErrorOutput.postValue(
-                context.getString(
+            _liveErrorOutput.value = context.getString(
                     R.string.helper_error_connection_failed_to_close
                 )
-            )
-            _liveErrorOutput.postValue("${e.localizedMessage}\n")
+            _liveErrorOutput.value = "${e.localizedMessage}\n"
         }
     }
 
@@ -99,7 +97,7 @@ class ArduinoHelper
         val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
         context.registerReceiver(arduinoPermReceiver, filter) // register the broadcast receiver
         usbManager.requestPermission(device.value, permissionIntent)
-        _liveInfoOutput.postValue(context.getString(R.string.helper_info_usb_permission_requested))
+        _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
     }
 
     /**
@@ -118,21 +116,21 @@ class ArduinoHelper
             serialPort = UsbSerialDevice.createUsbSerialDevice(device, connection)
         } catch (e: IllegalStateException) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.postValue(context.getString(R.string.helper_error_connection_closed_unexpectedly))
+            _liveErrorOutput.value = context.getString(R.string.helper_error_connection_closed_unexpectedly)
         } catch (e: NullPointerException) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.postValue(context.getString(
-                R.string.helper_error_connection_failed_to_open))
+            _liveErrorOutput.value = context.getString(
+                R.string.helper_error_connection_failed_to_open)
         } catch (e: Exception) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.postValue(context.getString(
-                R.string.helper_error_connection_failed_to_open_unknown))
+            _liveErrorOutput.value =
+                context.getString(R.string.helper_error_connection_failed_to_open_unknown)
         }
 
         if (::serialPort.isInitialized)
             prepareSerialPort(serialPort)
         else {
-            _liveInfoOutput.postValue(context.getString(R.string.helper_error_serial_port_is_null))
+            _liveInfoOutput.value = context.getString(R.string.helper_error_serial_port_is_null)
             connection.close()
         }
     }
@@ -151,9 +149,10 @@ class ArduinoHelper
                 it.setParity(UsbSerialInterface.PARITY_NONE)
                 it.setFlowControl(UsbSerialInterface.FLOW_CONTROL_OFF)
                 it.read(arduinoSerialReceiver) // messages will be received from the receiver.
-                _liveInfoOutput.postValue(context.getString(R.string.helper_info_serial_connection_opened))
+                _liveInfoOutput.value = context.getString(R.string.helper_info_serial_connection_opened)
             } else { // serial port not opened.
-                _liveErrorOutput.postValue(context.getString(R.string.helper_error_serial_connection_not_opened))
+                _liveErrorOutput.value =
+                    context.getString(R.string.helper_error_serial_connection_not_opened)
             }
         }
     }
@@ -166,49 +165,39 @@ class ArduinoHelper
             if (::serialPort.isInitialized && command.isNotBlank()) {
                 serialPort.write(command.toByteArray())
                 // go to next line because the answer might be sent in more than one part.
-                _liveOutput.postValue(context.getString(R.string.next_line))
+                _liveOutput.value = context.getString(R.string.next_line)
                 true
             } else {
-                _liveErrorOutput.postValue(context.getString(R.string.helper_error_serial_port_is_null))
+                _liveErrorOutput.value = context.getString(R.string.helper_error_serial_port_is_null)
                 false
             }
         } catch (e: Exception) {
-            _liveErrorOutput.postValue(
-                context.getString(R.string.helper_error_write_problem) +
-                    " \n${e.localizedMessage}\n")
+            _liveErrorOutput.value = context.getString(R.string.helper_error_write_problem) +
+                    " \n${e.localizedMessage}\n"
             Log.e(TAG, "$e")
             false
         }
     }
 
-    fun getLiveOutput(): LiveData<String> {
-
-        val liveDataMerger = MediatorLiveData<String>()
-        liveDataMerger.addSource(_liveOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoPermReceiver.liveOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoSerialReceiver.liveOutput) { liveDataMerger.value = it }
-
-        return liveDataMerger
+    fun getLiveOutput(): Flow<String> {
+        
+        return _liveOutput
+            .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
     }
 
-    fun getLiveInfoOutput(): LiveData<String> {
-
-        val liveDataMerger = MediatorLiveData<String>()
-        liveDataMerger.addSource(_liveInfoOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoPermReceiver.liveInfoOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoSerialReceiver.liveInfoOutput) { liveDataMerger.value = it }
+    fun getLiveInfoOutput(): Flow<String> {
 
-        return liveDataMerger
+        return _liveInfoOutput
+            .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
     }
 
-    fun getLiveErrorOutput(): LiveData<String> {
-
-        val liveDataMerger = MediatorLiveData<String>()
-        liveDataMerger.addSource(_liveErrorOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoPermReceiver.liveErrorOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(arduinoSerialReceiver.liveErrorOutput) { liveDataMerger.value = it }
+    fun getLiveErrorOutput(): Flow<String> {
 
-        return liveDataMerger
+        return _liveErrorOutput
+            .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index dda0f115..d70301ee 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -8,6 +8,8 @@ import android.hardware.usb.UsbManager
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
 
@@ -22,15 +24,15 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
         private const val TAG = "ArduinoPermReceiver"
     }
 
-    private val _liveOutput = MutableLiveData<String>()
-    private val _liveInfoOutput = MutableLiveData<String>()
-    private val _liveErrorOutput = MutableLiveData<String>()
+    private val _liveOutput = MutableStateFlow("")
+    private val _liveInfoOutput = MutableStateFlow("")
+    private val _liveErrorOutput = MutableStateFlow("")
 
-    val liveOutput: LiveData<String>
+    val liveOutput: StateFlow<String>
         get() = _liveOutput
-    val liveInfoOutput: LiveData<String>
+    val liveInfoOutput: StateFlow<String>
         get() = _liveInfoOutput
-    val liveErrorOutput: LiveData<String>
+    val liveErrorOutput: StateFlow<String>
         get() = _liveErrorOutput
 
     private val _liveGrantedDevice = MutableLiveData<UsbDevice>()
@@ -46,20 +48,20 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
                     .getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
 
                 if (permissionGranted) {
-                    _liveInfoOutput.postValue(
+                    _liveInfoOutput.value =
                         "${context?.getString(R.string.breceiver_info_usb_permission_granted)} ${device?.manufacturerName}"
-                    )
                     Log.i(TAG, "USB permission granted by the user")
                     device?.let { _liveGrantedDevice.postValue(it) }
                 } else {
                     Log.e(TAG, "USB permission was probably denied by the user")
-                    _liveErrorOutput.postValue(
+                    _liveErrorOutput.value =
                         "${context?.getString(R.string.breceiver_error_usb_permission_denied)} ${device?.manufacturerName}"
-                    )
                 }
             }
-            UsbManager.ACTION_USB_DEVICE_ATTACHED -> _liveOutput.postValue(context?.getString(R.string.breceiver_info_device_attached))
-            UsbManager.ACTION_USB_DEVICE_DETACHED -> _liveOutput.postValue(context?.getString(R.string.breceiver_info_device_detached))
+            UsbManager.ACTION_USB_DEVICE_ATTACHED -> _liveOutput.value =
+                context?.getString(R.string.breceiver_info_device_attached) ?: ""
+            UsbManager.ACTION_USB_DEVICE_DETACHED -> _liveOutput.value =
+                context?.getString(R.string.breceiver_info_device_detached) ?: ""
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt
index b990c443..cea3438b 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt
@@ -1,9 +1,9 @@
 package org.kabiri.android.usbterminal.arduino
 
 import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import com.felhr.usbserial.UsbSerialInterface
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import java.io.UnsupportedEncodingException
 import java.nio.charset.Charset
 
@@ -18,15 +18,15 @@ class ArduinoSerialReceiver: UsbSerialInterface.UsbReadCallback {
         private const val TAG = "ArduinoSerialReceiver"
     }
 
-    private val _liveOutput = MutableLiveData<String>()
-    private val _liveInfoOutput = MutableLiveData<String>()
-    private val _liveErrorOutput = MutableLiveData<String>()
+    private val _liveOutput = MutableStateFlow("")
+    private val _liveInfoOutput = MutableStateFlow("")
+    private val _liveErrorOutput = MutableStateFlow("")
 
-    val liveOutput: LiveData<String>
+    val liveOutput: StateFlow<String>
         get() = _liveOutput
-    val liveInfoOutput: LiveData<String>
+    val liveInfoOutput: StateFlow<String>
         get() = _liveInfoOutput
-    val liveErrorOutput: LiveData<String>
+    val liveErrorOutput: StateFlow<String>
         get() = _liveErrorOutput
 
     override fun onReceivedData(message: ByteArray?) {
@@ -34,14 +34,14 @@ class ArduinoSerialReceiver: UsbSerialInterface.UsbReadCallback {
             try { // reading the message from the arduino board.
                 val encoded = String(message, Charset.defaultCharset())
                 Log.i(TAG, "message from arduino: $encoded")
-                _liveOutput.postValue(encoded)
+                _liveOutput.value = encoded
             } catch (e: UnsupportedEncodingException) {
                 e.printStackTrace()
                 Log.e(TAG, "Encoding problem occurred when reading the serial message: $e")
-                _liveErrorOutput.postValue("\n${e.localizedMessage}")
+                _liveErrorOutput.value = "\n${e.localizedMessage}"
             } catch (e: Exception) {
                 Log.e(TAG, "Unknown error occurred when reading the serial message: $e")
-                _liveErrorOutput.postValue("\n${e.localizedMessage}")
+                _liveErrorOutput.value = "\n${e.localizedMessage}"
             }
         } ?: run {
             Log.e(TAG, "Message was null")
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 64a668e6..222f3a48 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -3,8 +3,12 @@ package org.kabiri.android.usbterminal.viewmodel
 import android.hardware.usb.UsbDevice
 import androidx.lifecycle.*
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import org.kabiri.android.usbterminal.model.OutputText
@@ -39,32 +43,35 @@ class MainActivityViewModel
      * Transforms the outputs from ArduinoHelper into spannable text
      * and merges them in one single live data.
      */
-    fun getLiveOutput(): LiveData<OutputText> {
+    suspend fun getLiveOutput(): StateFlow<OutputText> {
 
-        val liveOutput = arduinoHelper.getLiveOutput()
-        val liveInfoOutput = arduinoHelper.getLiveInfoOutput()
-        val liveErrorOutput = arduinoHelper.getLiveErrorOutput()
+        val serialOutput = arduinoHelper.getLiveOutput()
+        val serialInfoOutput = arduinoHelper.getLiveInfoOutput()
+        val serialErrorOutput = arduinoHelper.getLiveErrorOutput()
 
-        val liveSpannedOutput: LiveData<OutputText> = Transformations.map(liveOutput) {
+        val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_NORMAL)
         }
 
-        val liveSpannedInfoOutput: LiveData<OutputText> = Transformations.map(liveInfoOutput) {
+        val liveSpannedInfoOutput: Flow<OutputText> = serialInfoOutput.map {
             _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_INFO)
         }
 
-        val liveSpannedErrorOutput: LiveData<OutputText> = Transformations.map(liveErrorOutput) {
+        val liveSpannedErrorOutput: Flow<OutputText> = serialErrorOutput.map {
             _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_ERROR)
         }
 
-        val liveDataMerger = MediatorLiveData<OutputText>()
-        liveDataMerger.addSource(liveSpannedOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(liveSpannedInfoOutput) { liveDataMerger.value = it }
-        liveDataMerger.addSource(liveSpannedErrorOutput) { liveDataMerger.value = it }
+//        val liveDataMerger = MediatorLiveData<OutputText>()
+//        liveDataMerger.addSource(liveSpannedOutput) { liveDataMerger.value = it }
+//        liveDataMerger.addSource(liveSpannedInfoOutput) { liveDataMerger.value = it }
+//        liveDataMerger.addSource(liveSpannedErrorOutput) { liveDataMerger.value = it }
 
-        return liveDataMerger
+        return liveSpannedOutput
+            .combine(liveSpannedInfoOutput) { a, b -> b }
+            .combine(liveSpannedErrorOutput) { a, b -> b }
+            .stateIn(viewModelScope)
     }
 }
\ No newline at end of file

From 597c5af23f3441e484793bb90cc6225747ab902f Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 22:03:12 +0200
Subject: [PATCH 004/126] refactor: format code - no changes

---
 .../android/usbterminal/arduino/ArduinoHelper.kt  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index b0649df4..cc2c4792 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -60,12 +60,14 @@ class ArduinoHelper
                 } else {
                     _liveErrorOutput.value =
                         context.getString(R.string.helper_error_device_not_found)
-                    _liveErrorOutput.value = context.getString(R.string.helper_error_connecting_anyway)
+                    _liveErrorOutput.value =
+                        context.getString(R.string.helper_error_connecting_anyway)
                     connect(device)
                 }
             }
         } else {
-            _liveErrorOutput.value = context.getString(R.string.helper_error_usb_devices_not_attached)
+            _liveErrorOutput.value =
+                context.getString(R.string.helper_error_usb_devices_not_attached)
         }
     }
 
@@ -116,7 +118,8 @@ class ArduinoHelper
             serialPort = UsbSerialDevice.createUsbSerialDevice(device, connection)
         } catch (e: IllegalStateException) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.value = context.getString(R.string.helper_error_connection_closed_unexpectedly)
+            _liveErrorOutput.value =
+                context.getString(R.string.helper_error_connection_closed_unexpectedly)
         } catch (e: NullPointerException) {
             Log.e(TAG, "${e.message}")
             _liveErrorOutput.value = context.getString(
@@ -149,7 +152,8 @@ class ArduinoHelper
                 it.setParity(UsbSerialInterface.PARITY_NONE)
                 it.setFlowControl(UsbSerialInterface.FLOW_CONTROL_OFF)
                 it.read(arduinoSerialReceiver) // messages will be received from the receiver.
-                _liveInfoOutput.value = context.getString(R.string.helper_info_serial_connection_opened)
+                _liveInfoOutput.value =
+                    context.getString(R.string.helper_info_serial_connection_opened)
             } else { // serial port not opened.
                 _liveErrorOutput.value =
                     context.getString(R.string.helper_error_serial_connection_not_opened)
@@ -168,7 +172,8 @@ class ArduinoHelper
                 _liveOutput.value = context.getString(R.string.next_line)
                 true
             } else {
-                _liveErrorOutput.value = context.getString(R.string.helper_error_serial_port_is_null)
+                _liveErrorOutput.value =
+                    context.getString(R.string.helper_error_serial_port_is_null)
                 false
             }
         } catch (e: Exception) {

From ca1ef487a0dac520893540e27488b60e0e56de05 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 23:02:51 +0200
Subject: [PATCH 005/126] refactor: no changes

---
 .../usbterminal/arduino/ArduinoHelper.kt      | 36 ++++++++-----------
 .../viewmodel/MainActivityViewModel.kt        |  6 ++--
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index cc2c4792..d7dba16c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -38,8 +38,22 @@ class ArduinoHelper
     }
 
     private val _liveOutput = MutableStateFlow("")
+    val output: Flow<String>
+        get() = _liveOutput
+            .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
+
     private val _liveInfoOutput = MutableStateFlow("")
+    val infoOutput: Flow<String>
+        get() = _liveInfoOutput
+            .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
+
     private val _liveErrorOutput = MutableStateFlow("")
+    val errorOutput: Flow<String>
+        get() = _liveErrorOutput
+            .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
+            .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
 
     private var usbManager: UsbManager = context.getSystemService(Context.USB_SERVICE) as UsbManager
     private lateinit var connection: UsbDeviceConnection
@@ -183,26 +197,4 @@ class ArduinoHelper
             false
         }
     }
-
-    fun getLiveOutput(): Flow<String> {
-        
-        return _liveOutput
-            .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
-            .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
-    }
-
-    fun getLiveInfoOutput(): Flow<String> {
-
-        return _liveInfoOutput
-            .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
-            .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
-    }
-
-    fun getLiveErrorOutput(): Flow<String> {
-
-        return _liveErrorOutput
-            .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
-            .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 222f3a48..f4ede830 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -45,9 +45,9 @@ class MainActivityViewModel
      */
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
-        val serialOutput = arduinoHelper.getLiveOutput()
-        val serialInfoOutput = arduinoHelper.getLiveInfoOutput()
-        val serialErrorOutput = arduinoHelper.getLiveErrorOutput()
+        val serialOutput = arduinoHelper.output
+        val serialInfoOutput = arduinoHelper.infoOutput
+        val serialErrorOutput = arduinoHelper.errorOutput
 
         val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it

From 81c5a26611564ab59dd899f68e8a57ed59644db0 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 18 Jul 2023 23:13:23 +0200
Subject: [PATCH 006/126] fix: clicking connect button multiple times outputs
 error regardless of the last message

---
 .../java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index d7dba16c..2e492e78 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -80,6 +80,7 @@ class ArduinoHelper
                 }
             }
         } else {
+            _liveErrorOutput.value = ""
             _liveErrorOutput.value =
                 context.getString(R.string.helper_error_usb_devices_not_attached)
         }

From 550ba01703ec527d6ae1cd1168a0d21632fc6620 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 19 Jul 2023 05:12:12 +0200
Subject: [PATCH 007/126] chore: update dependencies and add jetpack compse

---
 app/build.gradle.kts | 29 ++++++++++++++++++++++++-----
 build.gradle         |  6 +++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 253fb968..b271179a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,14 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.4"
+    }
+
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 23
@@ -168,8 +176,8 @@ val firebase_bom_version: String by project
 val hilt_version: String by project
 dependencies {
 
-    implementation("androidx.appcompat:appcompat:1.6.0")
-    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
     // Firebase
@@ -182,13 +190,24 @@ dependencies {
     kapt("com.google.dagger:hilt-compiler:$hilt_version")
 
     // Coroutines
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
-    implementation("androidx.activity:activity-compose:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
+    implementation("androidx.activity:activity-compose:1.7.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 
+    // Compose Bom
+    val composeBom = platform("androidx.compose:compose-bom:2023.06.01")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.material3:material3")
+    // Compose - Android Studio Preview support
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    implementation("androidx.activity:activity-compose:1.7.1")
+
     // hilt testing
     // more info:
     // https://developer.android.com/training/dependency-injection/hilt-testing
diff --git a/build.gradle b/build.gradle
index 09ce2b2e..1bf710b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.10'
+        kotlin_version = '1.8.10'
         hilt_version = '2.44'
         firebase_bom_version = '30.5.0'
         jacoco_version = '0.8.8'
@@ -8,13 +8,13 @@ buildscript {
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath "com.google.gms:google-services:4.3.15"
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.4"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.7"
     }
 }
 
 plugins {
     id("com.android.application") version "7.4.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.7.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("org.sonarqube") version "3.5.0.2730"
 }
 

From 52b6e1ace73b6debb975770793f16d1244febd3b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 19 Jul 2023 05:14:11 +0200
Subject: [PATCH 008/126] feature: add a compose view to load a snapshot list
 of OutputText

---
 .../android/usbterminal/MainActivity.kt       | 21 +++++++++++++++++++
 .../viewmodel/MainActivityViewModel.kt        | 20 +++++++++++-------
 app/src/main/res/layout/activity_main.xml     | 11 +++++++++-
 app/src/main/res/menu/activity_main_menu.xml  |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 44607fe1..2989a160 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -12,6 +12,12 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
@@ -33,6 +39,21 @@ class MainActivity : AppCompatActivity() {
         val etInput = findViewById<EditText>(R.id.etInput)
         val tvOutput = findViewById<TextView>(R.id.tvOutput)
         val btEnter = findViewById<Button>(R.id.btEnter)
+        val composeView = findViewById<ComposeView>(R.id.composeView)
+
+        composeView.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+
+            setContent {
+                LazyColumn(modifier = Modifier.fillMaxSize()) {
+                    for (item in viewModel.output2) {
+                        item {
+                            BasicText(text = item.text)
+                        }
+                    }
+                }
+            }
+        }
 
         // make the text view scrollable:
         tvOutput.movementMethod = ScrollingMovementMethod()
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index f4ede830..90e81d95 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -1,6 +1,8 @@
 package org.kabiri.android.usbterminal.viewmodel
 
 import android.hardware.usb.UsbDevice
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.lifecycle.*
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
@@ -26,6 +28,7 @@ class MainActivityViewModel
     private val _outputLive = MutableStateFlow("")
     val output: StateFlow<String>
         get() = _outputLive
+    val output2 = SnapshotStateList<OutputText>()
 
     fun askForConnectionPermission() = arduinoHelper.askForConnectionPermission()
 
@@ -51,24 +54,25 @@ class MainActivityViewModel
 
         val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it
-            return@map OutputText(it, OutputText.OutputType.TYPE_NORMAL)
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_NORMAL)
+            output2.add(outputText)
+            return@map outputText
         }
 
         val liveSpannedInfoOutput: Flow<OutputText> = serialInfoOutput.map {
             _outputLive.value = _outputLive.value + it
-            return@map OutputText(it, OutputText.OutputType.TYPE_INFO)
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_INFO)
+            output2.add(outputText)
+            return@map outputText
         }
 
         val liveSpannedErrorOutput: Flow<OutputText> = serialErrorOutput.map {
             _outputLive.value = _outputLive.value + it
-            return@map OutputText(it, OutputText.OutputType.TYPE_ERROR)
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_ERROR)
+            output2.add(outputText)
+            return@map outputText
         }
 
-//        val liveDataMerger = MediatorLiveData<OutputText>()
-//        liveDataMerger.addSource(liveSpannedOutput) { liveDataMerger.value = it }
-//        liveDataMerger.addSource(liveSpannedInfoOutput) { liveDataMerger.value = it }
-//        liveDataMerger.addSource(liveSpannedErrorOutput) { liveDataMerger.value = it }
-
         return liveSpannedOutput
             .combine(liveSpannedInfoOutput) { a, b -> b }
             .combine(liveSpannedErrorOutput) { a, b -> b }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2eeabae..9e08b0d0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,13 +15,22 @@
         android:gravity="bottom"
         android:scrollbars="vertical"
         android:text="@{viewModel.output}"
-        app:layout_constraintBottom_toTopOf="@+id/etInput"
+        app:layout_constraintBottom_toTopOf="@+id/composeView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/composeView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvOutput"
+        app:layout_constraintBottom_toTopOf="@id/etInput"/>
+
     <Button
         android:id="@+id/btEnter"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/menu/activity_main_menu.xml b/app/src/main/res/menu/activity_main_menu.xml
index 025678fb..0f6f6869 100644
--- a/app/src/main/res/menu/activity_main_menu.xml
+++ b/app/src/main/res/menu/activity_main_menu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/actionSettings" android:title="@string/title_disconnect" app:showAsAction="ifRoom" android:icon="@drawable/ic_baseline_settings_24"/>
     <item android:id="@+id/actionConnect" android:title="@string/title_connect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_white_24dp"/>
     <item android:id="@+id/actionDisconnect" android:title="@string/title_disconnect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_off_white_24dp"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e307bff..bd8030b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="app_name">USBTerminal</string>
     <string name="title_connect">Connect</string>
     <string name="title_disconnect">Disconnect</string>
+    <string name="title_settings">Settings</string>
 
     <!-- Home Screen -->
     <string name="home_bt_enter">Enter</string>

From 700194c9a91bd111d340411376093f2b99dc7855 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 12 Dec 2023 21:57:40 +0100
Subject: [PATCH 009/126] feature: hopfully add a composable scrolling list

---
 .idea/deploymentTargetDropDown.xml            | 17 +++++++++++
 .idea/kotlinc.xml                             |  6 ++++
 .idea/misc.xml                                |  3 +-
 .../android/usbterminal/MainActivity.kt       | 28 ++++++++++++++++---
 .../res/drawable/ic_baseline_settings_24.xml  |  9 ++++++
 fastlane/Fastfile                             | 21 ++++++++++++--
 6 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_settings_24.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..4d459790
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-09-11T10:57:06.838905Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..0fc31131
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 669e0711..dd0bb8c5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeSettings">
     <configurations>
@@ -6,7 +5,7 @@
     </configurations>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="zulu-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 2989a160..94a800d3 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -12,12 +12,20 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
@@ -44,14 +52,26 @@ class MainActivity : AppCompatActivity() {
         composeView.apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
-            setContent {
-                LazyColumn(modifier = Modifier.fillMaxSize()) {
+            setContent() {
+                val columnState = rememberLazyListState()
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize(),
+                    state = columnState,
+                    contentPadding = PaddingValues(0.dp),
+                    verticalArrangement = Arrangement.spacedBy(0.dp),
+                ) {
                     for (item in viewModel.output2) {
                         item {
-                            BasicText(text = item.text)
+                            Text(
+                                modifier = Modifier.background(color = Color.Blue),
+                                text = item.text,
+                                )
                         }
                     }
                 }
+                LaunchedEffect(viewModel.output2) {
+                    columnState.animateScrollToItem(viewModel.output2.size-1)
+                }
             }
         }
 
diff --git a/app/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml
new file mode 100644
index 00000000..b86b554d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_settings_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e8381099..55576645 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -49,7 +49,24 @@ platform :android do
 
   desc "Deploy a new version to the Google Play"
   lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
+    gradle(
+        task: 'bundle',
+        build_type: 'Release'
+    )
+    upload_to_play_store(
+             track: 'internal',
+             release_status: 'draft',
+             aab: './app/build/outputs/bundle/release/app-release.aab',
+             skip_upload_apk: 'true',
+             skip_upload_metadata: 'true',
+             skip_upload_changelogs: 'true',
+             skip_upload_images: 'true',
+             skip_upload_screenshots: 'true',
+             json_key: ENV['SERVICE_ACCOUNT_USB_TERMINAL_PLAY_STORE']
+    )
+#     upload_to_play_store_internal_app_sharing(
+#         aab: './app/build/outputs/bundle/release/app-release.aab',
+#         json_key: ENV['SERVICE_ACCOUNT_USB_TERMINAL_PLAY_STORE']
+#     )
   end
 end

From 2dbd26de041da3b14aeddb5725281078133f8bd6 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 12 Dec 2023 22:04:51 +0100
Subject: [PATCH 010/126] refactor: remove repeated dependency

---
 app/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b271179a..1142df30 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -191,7 +191,6 @@ dependencies {
 
     // Coroutines
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.activity:activity-compose:1.7.2")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")

From 6a473f68d9c7460c47a4c28e36e21fc465cde96f Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 12 Dec 2023 22:17:57 +0100
Subject: [PATCH 011/126] chore: update gradle

---
 .idea/misc.xml                           | 3 ++-
 app/build.gradle.kts                     | 8 ++++++--
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index dd0bb8c5..1fd0812a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeSettings">
     <configurations>
@@ -5,7 +6,7 @@
     </configurations>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="zulu-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1142df30..efecc1eb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,8 +18,12 @@ android {
     compileSdk = 33
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlin {
+        jvmToolchain(17)
     }
 
     buildFeatures {
diff --git a/build.gradle b/build.gradle
index 1bf710b7..1b4e8542 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version "7.4.2" apply false
+    id("com.android.application") version '8.1.4' apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("org.sonarqube") version "3.5.0.2730"
 }
diff --git a/gradle.properties b/gradle.properties
index ebca75d9..af731300 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
 #android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef1e3108..c140e0f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

From d4f8eaa3f4d840d5441abc19483d8cd7a12a4dfb Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 12 Dec 2023 22:30:22 +0100
Subject: [PATCH 012/126] chore: update compileSdk

---
 app/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index efecc1eb..46e4b993 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -34,6 +34,7 @@ android {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
 
+    compileSdk = 34
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 23
@@ -181,7 +182,7 @@ val hilt_version: String by project
 dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
     // Firebase

From a661fad0af0441f8e65924894a11d0596703dd3c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Tue, 12 Dec 2023 22:33:18 +0100
Subject: [PATCH 013/126] chore: update activity-compose

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 46e4b993..685203a0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -210,7 +210,7 @@ dependencies {
     // Compose - Android Studio Preview support
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
-    implementation("androidx.activity:activity-compose:1.7.1")
+    implementation("androidx.activity:activity-compose:1.8.1")
 
     // hilt testing
     // more info:

From 886d10a7346121426707c268a2fe70e5050dbfaf Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 18 Dec 2023 16:58:31 +0100
Subject: [PATCH 014/126] refactor: hopefully fix night mode colors

---
 .../android/usbterminal/MainActivity.kt       | 36 ++++++++++---------
 .../android/usbterminal/ui/theme/Color.kt     | 18 ++++++++++
 .../android/usbterminal/ui/theme/Theme.kt     | 34 ++++++++++++++++++
 3 files changed, 72 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 94a800d3..37992304 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -16,9 +16,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
 
 @AndroidEntryPoint
@@ -52,26 +53,29 @@ class MainActivity : AppCompatActivity() {
         composeView.apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
-            setContent() {
+            setContent {
                 val columnState = rememberLazyListState()
-                LazyColumn(
-                    modifier = Modifier.fillMaxSize(),
-                    state = columnState,
-                    contentPadding = PaddingValues(0.dp),
-                    verticalArrangement = Arrangement.spacedBy(0.dp),
-                ) {
-                    for (item in viewModel.output2) {
-                        item {
-                            Text(
-                                modifier = Modifier.background(color = Color.Blue),
-                                text = item.text,
+
+                UsbTerminalTheme(darkTheme = true) {
+                    LazyColumn(
+                        modifier = Modifier.fillMaxSize(),
+                        state = columnState,
+                        contentPadding = PaddingValues(0.dp),
+                        verticalArrangement = Arrangement.spacedBy(0.dp),
+                    ) {
+                        for (item in viewModel.output2) {
+                            item {
+                                Text(
+                                    text = item.text,
+                                    color = MaterialTheme.colorScheme.onPrimary,
                                 )
+                                LaunchedEffect(viewModel.output2) {
+                                    columnState.animateScrollToItem(viewModel.output2.size-1)
+                                }
+                            }
                         }
                     }
                 }
-                LaunchedEffect(viewModel.output2) {
-                    columnState.animateScrollToItem(viewModel.output2.size-1)
-                }
             }
         }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
new file mode 100644
index 00000000..e2a8be8f
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
@@ -0,0 +1,18 @@
+package org.kabiri.android.usbterminal.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val White = Color(0xFFFFFFFF)
+val Black = Color(0xFF000000)
+
+val ColorPrimaryDay = Color(0xFF607D8B)
+val ColorPrimaryDarkDay = Color(0xFF455A64)
+val ColorAccentDay = Color(0xFF8BC34A)
+val ColorPrimaryLightDay = Color(0xFFCFD8DC)
+val ColorPrimaryTextDay = Color(0xFF212121)
+val ColorSecondaryTextDay = Color(0xFF757575)
+
+val ColorPrimaryTextNight = Color(0xFFFFFFFF)
+val ColorSecondaryTextNight = Color(0xFFFFFFFF)
+
+
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt
new file mode 100644
index 00000000..1b298045
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt
@@ -0,0 +1,34 @@
+package org.kabiri.android.usbterminal.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Typography
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+private val darkColorTheme = darkColorScheme(
+    primary = Color.Black,
+)
+
+private val lightColorTheme = lightColorScheme(
+)
+
+private var isLightCustom: Boolean = false
+
+@Composable
+fun UsbTerminalTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
+    isLightCustom = if (darkTheme == null) !isSystemInDarkTheme() else !darkTheme
+
+    val colorScheme = if (isLightCustom) {
+        lightColorTheme
+    } else {
+        darkColorTheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content,
+    )
+}
\ No newline at end of file

From a0fa94e00812771b1210805a8034235192465db5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 18 Dec 2023 16:58:39 +0100
Subject: [PATCH 015/126] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index cda68ade..3e527694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@ app/build.gradle
 .idea/.name
 .idea/codeStyles/Project.xml
 .idea/misc.xml
+.idea/misc.xml

From cf4425d6170f645fca369e3d10e1ca10ff843af7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Fri, 22 Dec 2023 14:08:41 +0000
Subject: [PATCH 016/126] feature: add UserSettingRepository

---
 app/build.gradle.kts                          |  6 ++
 .../UserSettingRepositoryAndroidTest.kt       | 93 +++++++++++++++++++
 .../data/repository/UserSettingRepository.kt  | 71 ++++++++++++++
 .../android/usbterminal/di/AppModule.kt       | 31 ++++++-
 .../model/UserSettingPreferences.kt           |  7 ++
 build.gradle                                  |  9 +-
 6 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepository.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/model/UserSettingPreferences.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 685203a0..8e356365 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -179,6 +179,7 @@ fun loadKeyStore(name: String): Properties? {
 
 val firebase_bom_version: String by project
 val hilt_version: String by project
+val coroutines_version: String by project
 dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
@@ -212,6 +213,9 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.activity:activity-compose:1.8.1")
 
+    // data
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+
     // hilt testing
     // more info:
     // https://developer.android.com/training/dependency-injection/hilt-testing
@@ -226,6 +230,8 @@ dependencies {
     androidTestImplementation("androidx.test:core:1.5.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.ext:junit-ktx:1.1.5")
+    androidTestImplementation("androidx.test.ext:truth:1.5.0")
+    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
     // Espresso
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     // Hamcrest for view matching
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
new file mode 100644
index 00000000..91e246bd
--- /dev/null
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
@@ -0,0 +1,93 @@
+package org.kabiri.android.usbterminal.data.repository
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.kabiri.android.usbterminal.model.UserSettingPreferences
+
+private const val TEST_DATA_STORE_NAME = "test_data_store"
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class UserSettingRepositoryAndroidTest {
+
+    private val testCoroutineDispatcher: TestDispatcher = StandardTestDispatcher()
+    private val testCoroutineScope = TestScope(testCoroutineDispatcher + Job())
+    private val testContext = ApplicationProvider.getApplicationContext<Context>()
+
+    private val testDataStore: DataStore<Preferences> =
+        PreferenceDataStoreFactory.create(
+            scope = testCoroutineScope,
+            produceFile = { testContext.preferencesDataStoreFile(TEST_DATA_STORE_NAME) }
+        )
+
+    private val repository: UserSettingRepository = UserSettingRepository(testDataStore)
+
+    @Test
+    fun testFetchInitialPreferences() {
+
+        // arrange
+        val expected = UserSettingPreferences()
+        var actual: UserSettingPreferences? = null
+
+        // act
+        testCoroutineScope.runTest {
+            actual = repository.fetchInitialPreferences()
+        }
+
+        // assert
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun testWriteBaudRate() {
+
+        // arrange
+        val customBaudRate = 123
+        val expected = UserSettingPreferences(
+            baudRate = customBaudRate
+        )
+        var actual: UserSettingPreferences? = null
+
+        // act
+        testCoroutineScope.runTest {
+            repository.setBaudRate(customBaudRate)
+            actual = repository.preferenceFlow.first()
+        }
+
+        // assert
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun testClearResetsValuesToDefaults() {
+
+        // arrange
+        val customBaudRate = 123
+        val expected = UserSettingPreferences()
+        var actual: UserSettingPreferences? = null
+
+        // act
+        testCoroutineScope.runTest {
+            repository.setBaudRate(customBaudRate)
+            repository.clear()
+            actual = repository.preferenceFlow.first()
+        }
+
+        // assert
+        assertThat(actual).isEqualTo(expected)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepository.kt
new file mode 100644
index 00000000..680e0bbf
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepository.kt
@@ -0,0 +1,71 @@
+package org.kabiri.android.usbterminal.data.repository
+
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import org.kabiri.android.usbterminal.model.UserSettingPreferences
+import org.kabiri.android.usbterminal.model.defaultBaudRate
+import java.io.IOException
+import javax.inject.Inject
+
+private const val TAG = "UserSettingsRepository"
+internal const val USER_SETTING_PREFERENCES_NAME = "user_setting_repository"
+
+private object PreferencesKeys {
+    val BAUD_RATE = stringPreferencesKey("baud_rate")
+}
+
+internal interface IUserSettingRepository {
+    val preferenceFlow: Flow<UserSettingPreferences>
+    suspend fun setBaudRate(baudRate: Int)
+    suspend fun clear()
+    suspend fun fetchInitialPreferences(): UserSettingPreferences
+}
+
+internal class UserSettingRepository
+@Inject constructor(
+    private val dataStore: DataStore<Preferences>
+): IUserSettingRepository {
+    override val preferenceFlow: Flow<UserSettingPreferences> = dataStore.data
+        .catch { exception ->
+            // dataStore.data throws an IOException when an error is encountered when reading data
+            if (exception is IOException) {
+                Log.e(TAG, "Error reading preferences.", exception)
+                emit(emptyPreferences())
+            } else {
+                throw exception
+            }
+        }.map { preferences ->
+            mapPreferences(preferences)
+        }
+
+    override suspend fun setBaudRate(baudRate: Int) {
+        dataStore.edit { preferences ->
+            preferences[PreferencesKeys.BAUD_RATE] = baudRate.toString()
+        }
+    }
+
+    override suspend fun clear() {
+        dataStore.edit { preferences ->
+            preferences[PreferencesKeys.BAUD_RATE] = defaultBaudRate.toString()
+        }
+    }
+
+    private fun mapPreferences(preferences: Preferences): UserSettingPreferences {
+        // Get the user settings from preferences
+        // and convert it to a [UserSettingPreferences] object
+        return UserSettingPreferences(
+            baudRate = preferences[PreferencesKeys.BAUD_RATE]?.toIntOrNull() ?: defaultBaudRate
+        )
+    }
+
+    override suspend fun fetchInitialPreferences(): UserSettingPreferences =
+        mapPreferences(dataStore.data.first().toPreferences())
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 1b17095d..d2d43202 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -2,20 +2,29 @@ package org.kabiri.android.usbterminal.di
 
 import android.app.Application
 import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
+import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
+import org.kabiri.android.usbterminal.data.repository.USER_SETTING_PREFERENCES_NAME
+import org.kabiri.android.usbterminal.data.repository.UserSettingRepository
+import javax.inject.Singleton
 
 /**
  * Created by Ali Kabiri on 13.04.20.
  */
 @Module
 @InstallIn(SingletonComponent::class)
-class AppModule {
+internal class AppModule {
 
     @Provides
     fun provideContext(
@@ -40,4 +49,24 @@ class AppModule {
             arduinoSerialReceiver = arduinoSerialReceiver,
         )
     }
+
+    @Singleton
+    @Provides
+    fun provideDataStore(
+        @ApplicationContext
+        context: Context
+    ): DataStore<Preferences> {
+        return PreferenceDataStoreFactory.create(
+            produceFile = {
+                context.preferencesDataStoreFile(USER_SETTING_PREFERENCES_NAME)
+            }
+        )
+    }
+
+    @Provides
+    fun provideUserSettingRepository(
+        dataStore: DataStore<Preferences>
+    ): IUserSettingRepository {
+        return UserSettingRepository(dataStore)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/model/UserSettingPreferences.kt b/app/src/main/java/org/kabiri/android/usbterminal/model/UserSettingPreferences.kt
new file mode 100644
index 00000000..75637ea4
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/model/UserSettingPreferences.kt
@@ -0,0 +1,7 @@
+package org.kabiri.android.usbterminal.model
+
+internal const val defaultBaudRate: Int = 9600
+
+data class UserSettingPreferences(
+    val baudRate: Int = defaultBaudRate // Arduino default
+)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1b4e8542..7a848192 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.10'
-        hilt_version = '2.44'
-        firebase_bom_version = '30.5.0'
-        jacoco_version = '0.8.8'
+        coroutines_version = "1.6.4"
+        kotlin_version = "1.8.10"
+        hilt_version = "2.44"
+        firebase_bom_version = "30.5.0"
+        jacoco_version = "0.8.8"
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

From 3bf7e0d5a6affb2a43abb1027ea954c1f82bfecb Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Fri, 22 Dec 2023 16:34:42 +0000
Subject: [PATCH 017/126] feature: add usecases for getting and setting the
 custom baudrate

---
 .../usbterminal/common/FrequentMocks.kt       | 27 ++++++++++++++++
 .../GetCustomBaudRateUseCaseAndroidTest.kt    | 32 +++++++++++++++++++
 .../SetCustomBaudRateUseCaseAndroidTest.kt    | 30 +++++++++++++++++
 .../domain/GetCustomBaudRateUseCase.kt        | 21 ++++++++++++
 .../domain/SetCustomBaudRateUseCase.kt        | 18 +++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 129 insertions(+)
 create mode 100644 app/src/androidTest/java/org/kabiri/android/usbterminal/common/FrequentMocks.kt
 create mode 100644 app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
 create mode 100644 app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt

diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/common/FrequentMocks.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/common/FrequentMocks.kt
new file mode 100644
index 00000000..141f6b8e
--- /dev/null
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/common/FrequentMocks.kt
@@ -0,0 +1,27 @@
+package org.kabiri.android.usbterminal.common
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
+import org.kabiri.android.usbterminal.model.UserSettingPreferences
+
+internal fun getFakeUserSettingRepository(
+    onSetBaudRate: () -> Unit = {},
+    fakeUserSetting: UserSettingPreferences = UserSettingPreferences(baudRate = 123)
+): IUserSettingRepository {
+    return object: IUserSettingRepository {
+        override val preferenceFlow: Flow<UserSettingPreferences>
+            get() = flowOf(fakeUserSetting)
+
+        override suspend fun setBaudRate(baudRate: Int) {
+            onSetBaudRate()
+        }
+
+        override suspend fun clear() {}
+
+        override suspend fun fetchInitialPreferences(): UserSettingPreferences {
+            return fakeUserSetting
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
new file mode 100644
index 00000000..1abbd08f
--- /dev/null
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
@@ -0,0 +1,32 @@
+package org.kabiri.android.usbterminal.domain
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.kabiri.android.usbterminal.common.getFakeUserSettingRepository
+import org.kabiri.android.usbterminal.model.UserSettingPreferences
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class GetCustomBaudRateUseCaseAndroidTest {
+
+    @Test
+    fun testGetCustomBaudRateUseCaseAndroidTestReturns() = runTest {
+
+        // arrange
+        val expectedBaudRate = 1234
+        val fakeUserSettings = UserSettingPreferences(baudRate = expectedBaudRate)
+        val fakeUserSettingRepository =
+            getFakeUserSettingRepository(fakeUserSetting = fakeUserSettings)
+        val sut = GetCustomBaudRateUseCase(
+            userSettingRepository = fakeUserSettingRepository
+        )
+
+        // act
+        val actualBaudRate = sut().first()
+
+        // assert
+        assertThat(actualBaudRate).isEqualTo(expectedBaudRate)
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
new file mode 100644
index 00000000..913227fd
--- /dev/null
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
@@ -0,0 +1,30 @@
+package org.kabiri.android.usbterminal.domain
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.kabiri.android.usbterminal.common.getFakeUserSettingRepository
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class SetCustomBaudRateUseCaseAndroidTest {
+
+    @Test
+    fun testSetCustomBaudRateUseCaseAndroidTestCallsSetBaudRateOnRepository() = runTest {
+
+        // arrange
+        var isCalledSetBaudRate = false
+        val fakeUserSettingRepository = getFakeUserSettingRepository(onSetBaudRate = {
+            isCalledSetBaudRate = true
+        })
+        val sut = SetCustomBaudRateUseCase(
+            userSettingRepository = fakeUserSettingRepository
+        )
+
+        // act
+        sut(123)
+
+        // assert
+        assertThat(isCalledSetBaudRate).isTrue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
new file mode 100644
index 00000000..a2c0e0ea
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
@@ -0,0 +1,21 @@
+package org.kabiri.android.usbterminal.domain
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
+import javax.inject.Inject
+
+internal fun interface IGetCustomBaudRateUseCase {
+    suspend operator fun invoke(): Flow<Int>
+}
+
+internal class GetCustomBaudRateUseCase
+@Inject constructor(
+    private val userSettingRepository: IUserSettingRepository,
+): IGetCustomBaudRateUseCase {
+    override suspend fun invoke(): Flow<Int> {
+        val userSettingFlow = userSettingRepository.preferenceFlow
+        return userSettingFlow.map { it.baudRate }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
new file mode 100644
index 00000000..2d33592a
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
@@ -0,0 +1,18 @@
+package org.kabiri.android.usbterminal.domain
+
+import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
+import javax.inject.Inject
+
+internal fun interface ISetCustomBaudRateUseCase {
+    suspend operator fun invoke(baudRate: Int)
+}
+
+internal class SetCustomBaudRateUseCase
+@Inject constructor(
+    private val userSettingRepository: IUserSettingRepository,
+): ISetCustomBaudRateUseCase {
+    override suspend fun invoke(baudRate: Int) {
+        userSettingRepository.setBaudRate(baudRate)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd8030b3..f6a19d89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="helper_error_connection_failed_to_open_unknown">Failed to open device connection.\n</string>
     <string name="helper_error_connection_not_ready_to_close">No device connection to close\n</string>
     <string name="helper_error_connection_failed_to_close">Device connection failed to close\n</string>
+    <string name="helper_error_updating_baud_rate">Failed to update baud rate…\n</string>
     <string name="helper_info_serial_connection_opened">Serial Connection Opened\n</string>
     <string name="helper_info_serial_connection_closed">Serial Connection Closed\n</string>
     <string name="helper_info_usb_permission_requested">Requested permission to access the USB device…\n</string>

From 60221c84dde54874ff0fd70cd40a40f029eb1120 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 25 Dec 2023 15:27:57 +0000
Subject: [PATCH 018/126] feature: read current custom baudrate in
 ArduinoHelper and apply it when it changes

---
 .../usbterminal/arduino/ArduinoHelper.kt      | 43 ++++++++++++++++---
 .../android/usbterminal/di/AppModule.kt       | 20 +++++++++
 .../domain/GetCustomBaudRateUseCase.kt        |  4 +-
 .../ui/theme/setting/SettingViewModel.kt      | 26 +++++++++++
 .../viewmodel/MainActivityViewModel.kt        |  2 +-
 5 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 2e492e78..93d9d673 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -10,11 +10,16 @@ import android.hardware.usb.UsbManager
 import android.util.Log
 import com.felhr.usbserial.UsbSerialDevice
 import com.felhr.usbserial.UsbSerialInterface
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
 
 
@@ -26,15 +31,42 @@ import javax.inject.Inject
  *  registers the Arduino Permission Broadcast Receiver.
  */
 
-class ArduinoHelper
+private const val TAG = "ArduinoHelper"
+
+internal class ArduinoHelper
 @Inject constructor(
     private val context: Context,
     private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
-    private val arduinoSerialReceiver: ArduinoSerialReceiver
+    private val arduinoSerialReceiver: ArduinoSerialReceiver,
+    private val getBaudRate: IGetCustomBaudRateUseCase,
 ) {
 
-    companion object {
-        private const val TAG = "ArduinoHelper"
+    private var currentBaudRate = defaultBaudRate // Default value
+
+    init {
+        observeBaudRate()
+    }
+
+    private fun observeBaudRate() {
+        CoroutineScope(Dispatchers.IO).launch {
+            getBaudRate().collect { baudRate ->
+                currentBaudRate = baudRate
+                Log.d(TAG, "custom baud rate set = $baudRate")
+                if (::serialPort.isInitialized) {
+                    updateSerialPortBaudRate(baudRate)
+                }
+            }
+        }
+    }
+
+    private fun updateSerialPortBaudRate(baudRate: Int) {
+        try {
+            Log.d(TAG, "updateSerialPortBaudRate, current baud rate = $currentBaudRate")
+            serialPort.setBaudRate(baudRate)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error updating baud rate: ${e.message}")
+            _liveErrorOutput.value = context.getString(R.string.helper_error_updating_baud_rate)
+        }
     }
 
     private val _liveOutput = MutableStateFlow("")
@@ -161,7 +193,8 @@ class ArduinoHelper
         serialPort.let {
             if (it.open()) {
                 // init the serial port and set connection params.
-                it.setBaudRate(9600)
+                Log.d(TAG, "current baud rate = $currentBaudRate")
+                it.setBaudRate(currentBaudRate)
                 it.setDataBits(UsbSerialInterface.DATA_BITS_8)
                 it.setStopBits(UsbSerialInterface.STOP_BITS_1)
                 it.setParity(UsbSerialInterface.PARITY_NONE)
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index d2d43202..8747444b 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -17,6 +17,10 @@ import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import org.kabiri.android.usbterminal.data.repository.USER_SETTING_PREFERENCES_NAME
 import org.kabiri.android.usbterminal.data.repository.UserSettingRepository
+import org.kabiri.android.usbterminal.domain.GetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.SetCustomBaudRateUseCase
 import javax.inject.Singleton
 
 /**
@@ -42,11 +46,13 @@ internal class AppModule {
         context: Context,
         arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
         arduinoSerialReceiver: ArduinoSerialReceiver,
+        getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
     ): ArduinoHelper {
         return ArduinoHelper(
             context = context,
             arduinoPermReceiver = arduinoPermReceiver,
             arduinoSerialReceiver = arduinoSerialReceiver,
+            getBaudRate = getCustomBaudRateUseCase,
         )
     }
 
@@ -69,4 +75,18 @@ internal class AppModule {
     ): IUserSettingRepository {
         return UserSettingRepository(dataStore)
     }
+
+    @Provides
+    fun provideGetCustomBaudRateUseCase(
+        userSettingRepository: IUserSettingRepository
+    ): IGetCustomBaudRateUseCase {
+        return GetCustomBaudRateUseCase(userSettingRepository = userSettingRepository)
+    }
+
+    @Provides
+    fun provideSetCustomBaudRateUseCase(
+        userSettingRepository: IUserSettingRepository
+    ): ISetCustomBaudRateUseCase {
+        return SetCustomBaudRateUseCase(userSettingRepository = userSettingRepository)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
index a2c0e0ea..286b047c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCase.kt
@@ -6,14 +6,14 @@ import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import javax.inject.Inject
 
 internal fun interface IGetCustomBaudRateUseCase {
-    suspend operator fun invoke(): Flow<Int>
+    operator fun invoke(): Flow<Int>
 }
 
 internal class GetCustomBaudRateUseCase
 @Inject constructor(
     private val userSettingRepository: IUserSettingRepository,
 ): IGetCustomBaudRateUseCase {
-    override suspend fun invoke(): Flow<Int> {
+    override fun invoke(): Flow<Int> {
         val userSettingFlow = userSettingRepository.preferenceFlow
         return userSettingFlow.map { it.baudRate }
     }
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt
new file mode 100644
index 00000000..052cc3b6
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt
@@ -0,0 +1,26 @@
+package org.kabiri.android.usbterminal.ui.theme.setting
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
+import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
+import javax.inject.Inject
+
+/**
+ * Created by Ali Kabiri on 22.12.2023.
+ */
+@HiltViewModel
+internal class SettingViewModel
+@Inject constructor(
+    private val getBaudRate: IGetCustomBaudRateUseCase,
+    private val setBaudRate: ISetCustomBaudRateUseCase,
+): ViewModel() {
+
+    val currentBaudRate: Flow<Int>
+        get() = getBaudRate()
+
+    suspend fun setNewBaudRate(baudRate: Int) {
+        setBaudRate(baudRate)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 90e81d95..d51c9009 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -20,7 +20,7 @@ import javax.inject.Inject
  * Created by Ali Kabiri on 12.04.20.
  */
 @HiltViewModel
-class MainActivityViewModel
+internal class MainActivityViewModel
 @Inject constructor(
     private val arduinoHelper: ArduinoHelper,
 ): ViewModel() {

From 77362b3bcb1f90843ef615fab8e048e928287e1b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 25 Dec 2023 17:18:48 +0000
Subject: [PATCH 019/126] feature: add a bottom sheet to show setting content

---
 app/build.gradle.kts                          |  5 ++
 app/src/main/AndroidManifest.xml              |  3 +-
 .../android/usbterminal/MainActivity.kt       | 55 +++-----------
 .../common/CustomBottomSheetDialogFragment.kt | 32 +++++++++
 .../usbterminal/ui/setting/SettingContent.kt  | 72 +++++++++++++++++++
 .../ui/setting/SettingModalBottomSheet.kt     | 34 +++++++++
 .../{theme => }/setting/SettingViewModel.kt   |  2 +-
 .../android/usbterminal/ui/theme/Color.kt     | 13 ++--
 .../android/usbterminal/ui/theme/Theme.kt     | 15 ++--
 .../res/drawable/bg_modal_bottom_sheet.xml    | 10 +++
 app/src/main/res/drawable/bg_sheet_handle.xml |  5 ++
 app/src/main/res/layout/activity_main.xml     |  7 +-
 app/src/main/res/layout/sheet_content.xml     | 22 ++++++
 app/src/main/res/values-night/colors.xml      |  1 +
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/dimens.xml            |  5 ++
 app/src/main/res/values/styles.xml            | 13 +++-
 build.gradle                                  |  5 +-
 18 files changed, 236 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
 rename app/src/main/java/org/kabiri/android/usbterminal/ui/{theme => }/setting/SettingViewModel.kt (92%)
 create mode 100644 app/src/main/res/drawable/bg_modal_bottom_sheet.xml
 create mode 100644 app/src/main/res/drawable/bg_sheet_handle.xml
 create mode 100644 app/src/main/res/layout/sheet_content.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8e356365..7e6af0e1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -180,6 +180,7 @@ fun loadKeyStore(name: String): Properties? {
 val firebase_bom_version: String by project
 val hilt_version: String by project
 val coroutines_version: String by project
+val material_version: String by project
 dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
@@ -213,6 +214,10 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.activity:activity-compose:1.8.1")
 
+    // Other UI Libraries
+    implementation("com.google.android.material:material:$material_version")
+
+
     // data
     implementation("androidx.datastore:datastore-preferences:1.0.0")
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 521743c2..b22e1641 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
         <meta-data android:name="io.sentry.dsn" android:value="" />
 
         <activity android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 37992304..0b580f79 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -12,26 +12,15 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.unit.dp
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
-import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+import org.kabiri.android.usbterminal.ui.setting.SettingModalBottomSheet
+import org.kabiri.android.usbterminal.ui.setting.SettingViewModel
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
 
+@OptIn(ExperimentalMaterial3Api::class)
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
@@ -40,6 +29,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private val viewModel by viewModels<MainActivityViewModel>()
+    private val settingViewModel by viewModels<SettingViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -48,36 +38,6 @@ class MainActivity : AppCompatActivity() {
         val etInput = findViewById<EditText>(R.id.etInput)
         val tvOutput = findViewById<TextView>(R.id.tvOutput)
         val btEnter = findViewById<Button>(R.id.btEnter)
-        val composeView = findViewById<ComposeView>(R.id.composeView)
-
-        composeView.apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-
-            setContent {
-                val columnState = rememberLazyListState()
-
-                UsbTerminalTheme(darkTheme = true) {
-                    LazyColumn(
-                        modifier = Modifier.fillMaxSize(),
-                        state = columnState,
-                        contentPadding = PaddingValues(0.dp),
-                        verticalArrangement = Arrangement.spacedBy(0.dp),
-                    ) {
-                        for (item in viewModel.output2) {
-                            item {
-                                Text(
-                                    text = item.text,
-                                    color = MaterialTheme.colorScheme.onPrimary,
-                                )
-                                LaunchedEffect(viewModel.output2) {
-                                    columnState.animateScrollToItem(viewModel.output2.size-1)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
 
         // make the text view scrollable:
         tvOutput.movementMethod = ScrollingMovementMethod()
@@ -128,6 +88,11 @@ class MainActivity : AppCompatActivity() {
                 viewModel.disconnect()
                 true
             }
+            R.id.actionSettings -> {
+                SettingModalBottomSheet(viewModel = settingViewModel)
+                    .show(supportFragmentManager, TAG)
+                true
+            }
             else -> false
         }
     }
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
new file mode 100644
index 00000000..5b914562
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
@@ -0,0 +1,32 @@
+package org.kabiri.android.usbterminal.ui.common
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.kabiri.android.usbterminal.R
+
+open class CustomBottomSheetDialogFragment(
+    private val canUserDragToCancel: Boolean = true,
+): BottomSheetDialogFragment() {
+
+    override fun getTheme(): Int = R.style.ModalBottomSheetTheme
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+        BottomSheetDialog(requireContext(), theme)
+
+    /**
+     * Skip the "STATE_HALF_EXPANDED"
+     */
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        dialog?.let {
+            val sheet = it as BottomSheetDialog
+            sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            sheet.behavior.skipCollapsed = true
+            sheet.behavior.isDraggable = canUserDragToCancel
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
new file mode 100644
index 00000000..dee50667
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
@@ -0,0 +1,72 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+import org.kabiri.android.usbterminal.model.defaultBaudRate
+
+@Composable
+internal fun SettingContent(
+    modifier: Modifier = Modifier,
+    settingViewModel: SettingViewModel
+) {
+    val scope = rememberCoroutineScope()
+    val currentBaudRate by settingViewModel.currentBaudRate.collectAsState(defaultBaudRate)
+    var baudRateInput by remember { mutableStateOf(currentBaudRate.toString()) }
+    var showSaveIcon by remember { mutableStateOf(false) }
+
+    // keep baudRateInput updated with currentBaudRate
+    LaunchedEffect(currentBaudRate) {
+        baudRateInput = currentBaudRate.toString()
+    }
+
+    Column(modifier = modifier) {
+        OutlinedTextField(
+            value = baudRateInput,
+            onValueChange = { value: String ->
+                baudRateInput = value
+                showSaveIcon = value.toIntOrNull() != currentBaudRate
+            },
+            label = { Text("Baud Rate") },
+            singleLine = true,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            trailingIcon = {
+                if (showSaveIcon) {
+                    IconButton(onClick = {
+                        scope.launch {
+                            baudRateInput.toIntOrNull()?.let { baudRate ->
+                                settingViewModel.setNewBaudRate(baudRate)
+                                showSaveIcon = false
+                            }
+                        }
+                    }) {
+                        Icon(
+                            imageVector = Icons.Outlined.Check,
+                            contentDescription = "Save"
+                        )
+                    }
+                }
+            },
+            isError = baudRateInput.toIntOrNull() == null
+        )
+    }
+}
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
new file mode 100644
index 00000000..55bb977c
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
@@ -0,0 +1,34 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.ui.common.CustomBottomSheetDialogFragment
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+internal class SettingModalBottomSheet(
+    val onDismissed: () -> Unit = {},
+    val viewModel: SettingViewModel,
+): CustomBottomSheetDialogFragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        val view = layoutInflater.inflate(R.layout.sheet_content, container, true)
+        val composeView = view?.findViewById<ComposeView>(R.id.composeViewSettingContent)
+
+        composeView?.setContent {
+            UsbTerminalTheme {
+                SettingContent(settingViewModel = viewModel)
+            }
+        }
+
+        return view
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
similarity index 92%
rename from app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
index 052cc3b6..eb84cb22 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/setting/SettingViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.ui.theme.setting
+package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
index e2a8be8f..f8aae86a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Color.kt
@@ -2,17 +2,16 @@ package org.kabiri.android.usbterminal.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-val White = Color(0xFFFFFFFF)
-val Black = Color(0xFF000000)
-
 val ColorPrimaryDay = Color(0xFF607D8B)
-val ColorPrimaryDarkDay = Color(0xFF455A64)
+val ColorPrimaryNight = Color(0xFF455A64)
 val ColorAccentDay = Color(0xFF8BC34A)
-val ColorPrimaryLightDay = Color(0xFFCFD8DC)
+val ColorAccentNight = Color(0x8A8BC34A)
 val ColorPrimaryTextDay = Color(0xFF212121)
 val ColorSecondaryTextDay = Color(0xFF757575)
+val ColorBackgroundDay = Color(0xFFFFFFFF)
+val ColorBackgroundNight = Color(0xFF1E1E1E)
 
-val ColorPrimaryTextNight = Color(0xFFFFFFFF)
-val ColorSecondaryTextNight = Color(0xFFFFFFFF)
+val ColorPrimaryTextNight = Color(0x8AFFFFFF)
+val ColorSecondaryTextNight = Color(0x8AFFFFFF)
 
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt
index 1b298045..54143382 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/theme/Theme.kt
@@ -2,20 +2,27 @@ package org.kabiri.android.usbterminal.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Typography
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 
 private val darkColorTheme = darkColorScheme(
-    primary = Color.Black,
+    primary = ColorPrimaryNight,
+    onPrimary = ColorPrimaryTextNight,
+    secondary = ColorAccentNight,
+    onSecondary = ColorSecondaryTextNight,
+    background = ColorBackgroundNight,
 )
 
 private val lightColorTheme = lightColorScheme(
+    primary = ColorPrimaryDay,
+    onPrimary = ColorPrimaryTextDay,
+    secondary = ColorAccentDay,
+    onSecondary = ColorSecondaryTextDay,
+    background = ColorBackgroundDay,
 )
 
-private var isLightCustom: Boolean = false
+private var isLightCustom: Boolean = true
 
 @Composable
 fun UsbTerminalTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
diff --git a/app/src/main/res/drawable/bg_modal_bottom_sheet.xml b/app/src/main/res/drawable/bg_modal_bottom_sheet.xml
new file mode 100644
index 00000000..250b763f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_modal_bottom_sheet.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- based on specs: -->
+    <!-- https://m3.material.io/components/bottom-sheets/overview#0ccc1064-69de-49c2-8342-67dc8424306b -->
+    <corners
+        android:topLeftRadius="28dp"
+        android:topRightRadius="28dp" />
+    <solid android:color="@color/bg_modal_bottom_sheet" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_sheet_handle.xml b/app/src/main/res/drawable/bg_sheet_handle.xml
new file mode 100644
index 00000000..827effa0
--- /dev/null
+++ b/app/src/main/res/drawable/bg_sheet_handle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/divider"/>
+    <corners android:radius="@dimen/radius_corner_sheet_handle"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9e08b0d0..632635d9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -26,10 +27,10 @@
         android:id="@+id/composeView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/etInput"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvOutput"
-        app:layout_constraintBottom_toTopOf="@id/etInput"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvOutput" />
 
     <Button
         android:id="@+id/btEnter"
diff --git a/app/src/main/res/layout/sheet_content.xml b/app/src/main/res/layout/sheet_content.xml
new file mode 100644
index 00000000..1170ce3a
--- /dev/null
+++ b/app/src/main/res/layout/sheet_content.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_sheet"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <View
+        android:layout_width="40dp"
+        android:layout_height="4dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/bg_sheet_handle" />
+
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/composeViewSettingContent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e58d26cd..0b15e685 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,4 +5,5 @@
     <color name="textColorSecondary">#FFFFFF</color>
 
     <color name="icLauncherBackground">#455A64</color>
+    <color name="bg_modal_bottom_sheet">#1E1E1E</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b36d81b0..c3bb3785 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
     <color name="textColorPrimary">#212121</color>
     <color name="textColorSecondary">#757575</color>
 
+    <color name="bg_modal_bottom_sheet">#FFFFFF</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#BDBDBD</color>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..dc742050
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="radius_corner_sheet_handle">2dp</dimen>
+    <dimen name="width_max_modal_sheet">640dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4cfd2d2e..2fb7bc72 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
@@ -11,4 +11,15 @@
         <item name="android:textColorSecondary">@color/textColorSecondary</item>
     </style>
 
+    <style name="ModalBottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/bg_modal_bottom_sheet</item>
+    </style>
+
+    <style name="ModalBottomSheetTheme" parent="Theme.Design.BottomSheetDialog">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="bottomSheetStyle">@style/ModalBottomSheet</item>
+    </style>
+
 </resources>
diff --git a/build.gradle b/build.gradle
index 7a848192..c44ecfcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,11 @@
 buildscript {
     ext {
         coroutines_version = "1.6.4"
-        kotlin_version = "1.8.10"
-        hilt_version = "2.44"
         firebase_bom_version = "30.5.0"
+        hilt_version = "2.44"
         jacoco_version = "0.8.8"
+        kotlin_version = "1.8.10"
+        material_version = "1.11.0"
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

From fc4a63b2fa7d22b3be895a8cc753c206fb1173cb Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 25 Dec 2023 17:24:20 +0000
Subject: [PATCH 020/126] chore: update fastlane

---
 Gemfile.lock | 96 +++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 50 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 382d34e6..828e3551 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,25 +3,25 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.763.0)
-    aws-sdk-core (3.172.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.873.0)
+    aws-sdk-core (3.190.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.75.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -30,13 +30,12 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.99.0)
+    excon (0.108.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,8 +64,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.2)
+    fastimage (2.3.0)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -87,10 +86,11 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -98,7 +98,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -107,9 +107,9 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.5.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -122,26 +122,26 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -150,31 +150,30 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.7.1)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -183,21 +182,18 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 2a842a778c3d49f2db6bbc582a84008dd82e642d Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 19:01:27 +0100
Subject: [PATCH 021/126] refactor: separate Setting Value Item from the
 Setting Content

---
 .../domain/SetCustomBaudRateUseCase.kt        | 13 +++-
 .../usbterminal/ui/setting/SettingContent.kt  | 58 ++-------------
 .../ui/setting/SettingValueItem.kt            | 74 +++++++++++++++++++
 .../ui/setting/SettingViewModel.kt            |  6 +-
 4 files changed, 93 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
index 2d33592a..39f70280 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
@@ -1,18 +1,25 @@
 package org.kabiri.android.usbterminal.domain
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import javax.inject.Inject
 
 internal fun interface ISetCustomBaudRateUseCase {
-    suspend operator fun invoke(baudRate: Int)
+    operator fun invoke(baudRate: Int)
 }
 
 internal class SetCustomBaudRateUseCase
 @Inject constructor(
     private val userSettingRepository: IUserSettingRepository,
 ): ISetCustomBaudRateUseCase {
-    override suspend fun invoke(baudRate: Int) {
-        userSettingRepository.setBaudRate(baudRate)
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+    override fun invoke(baudRate: Int) {
+        scope.launch {
+            userSettingRepository.setBaudRate(baudRate)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
index dee50667..5899beeb 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
@@ -1,25 +1,10 @@
 package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Check
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 
 @Composable
@@ -27,46 +12,15 @@ internal fun SettingContent(
     modifier: Modifier = Modifier,
     settingViewModel: SettingViewModel
 ) {
-    val scope = rememberCoroutineScope()
     val currentBaudRate by settingViewModel.currentBaudRate.collectAsState(defaultBaudRate)
-    var baudRateInput by remember { mutableStateOf(currentBaudRate.toString()) }
-    var showSaveIcon by remember { mutableStateOf(false) }
-
-    // keep baudRateInput updated with currentBaudRate
-    LaunchedEffect(currentBaudRate) {
-        baudRateInput = currentBaudRate.toString()
-    }
 
     Column(modifier = modifier) {
-        OutlinedTextField(
-            value = baudRateInput,
-            onValueChange = { value: String ->
-                baudRateInput = value
-                showSaveIcon = value.toIntOrNull() != currentBaudRate
-            },
-            label = { Text("Baud Rate") },
-            singleLine = true,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            trailingIcon = {
-                if (showSaveIcon) {
-                    IconButton(onClick = {
-                        scope.launch {
-                            baudRateInput.toIntOrNull()?.let { baudRate ->
-                                settingViewModel.setNewBaudRate(baudRate)
-                                showSaveIcon = false
-                            }
-                        }
-                    }) {
-                        Icon(
-                            imageVector = Icons.Outlined.Check,
-                            contentDescription = "Save"
-                        )
-                    }
-                }
-            },
-            isError = baudRateInput.toIntOrNull() == null
+
+        // Baud Rate Setting
+        SettingValueItem(
+            currentValue = currentBaudRate,
+            onNewValue = settingViewModel::setNewBaudRate
         )
     }
 }
+
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
new file mode 100644
index 00000000..32ab5f68
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
@@ -0,0 +1,74 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+@Composable
+internal fun SettingValueItem(
+    currentValue: Int,
+    onNewValue: (Int) -> Unit
+) {
+    var inputValue by remember { mutableStateOf(currentValue.toString()) }
+    var showSaveIcon by remember { mutableStateOf(false) }
+
+    // keep baudRateInput updated with currentBaudRate
+    LaunchedEffect(currentValue) {
+        inputValue = currentValue.toString()
+    }
+
+    OutlinedTextField(
+        value = inputValue,
+        onValueChange = { value: String ->
+            inputValue = value
+            showSaveIcon = value.toIntOrNull() != currentValue
+        },
+        label = { Text("Baud Rate") },
+        singleLine = true,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        trailingIcon = {
+            if (showSaveIcon) {
+                IconButton(onClick = {
+                    inputValue.toIntOrNull()?.let { baudRate ->
+                        onNewValue(baudRate)
+                        showSaveIcon = false
+                    }
+                }) {
+                    Icon(
+                        imageVector = Icons.Outlined.Check,
+                        contentDescription = "Save"
+                    )
+                }
+            }
+        },
+        isError = inputValue.toIntOrNull() == null
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun SettingValueItemPreview() {
+    UsbTerminalTheme {
+        SettingValueItem(
+            currentValue = 9600,
+            onNewValue = {}
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
index eb84cb22..50e24566 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
@@ -1,8 +1,10 @@
 package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
 import javax.inject.Inject
@@ -20,7 +22,5 @@ internal class SettingViewModel
     val currentBaudRate: Flow<Int>
         get() = getBaudRate()
 
-    suspend fun setNewBaudRate(baudRate: Int) {
-        setBaudRate(baudRate)
-    }
+    fun setNewBaudRate(baudRate: Int) = setBaudRate(baudRate)
 }
\ No newline at end of file

From 5f4c1e188daf345f53ed57073068cdbe6907b1bd Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 19:14:27 +0100
Subject: [PATCH 022/126] feature: resetting settings to default dismisses the
 setting modal

---
 .../usbterminal/ui/setting/SettingContent.kt  | 11 ++++++++-
 .../ui/setting/SettingModalBottomSheet.kt     | 10 ++++++--
 .../ui/setting/SettingResetDefaultButton.kt   | 24 +++++++++++++++++++
 .../ui/setting/SettingViewModel.kt            |  5 ++++
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
index 5899beeb..4fa8b299 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
@@ -10,7 +10,8 @@ import org.kabiri.android.usbterminal.model.defaultBaudRate
 @Composable
 internal fun SettingContent(
     modifier: Modifier = Modifier,
-    settingViewModel: SettingViewModel
+    settingViewModel: SettingViewModel,
+    onDismiss: () -> Unit,
 ) {
     val currentBaudRate by settingViewModel.currentBaudRate.collectAsState(defaultBaudRate)
 
@@ -21,6 +22,14 @@ internal fun SettingContent(
             currentValue = currentBaudRate,
             onNewValue = settingViewModel::setNewBaudRate
         )
+
+        // Reset Default Button
+        SettingResetDefaultButton(
+            onClick = {
+                settingViewModel.resetDefault()
+                onDismiss()
+            }
+        )
     }
 }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
index 55bb977c..371d56c8 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingModalBottomSheet.kt
@@ -10,7 +10,7 @@ import org.kabiri.android.usbterminal.ui.common.CustomBottomSheetDialogFragment
 import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
 
 internal class SettingModalBottomSheet(
-    val onDismissed: () -> Unit = {},
+    val onDismiss: () -> Unit = {},
     val viewModel: SettingViewModel,
 ): CustomBottomSheetDialogFragment() {
 
@@ -25,7 +25,13 @@ internal class SettingModalBottomSheet(
 
         composeView?.setContent {
             UsbTerminalTheme {
-                SettingContent(settingViewModel = viewModel)
+                SettingContent(
+                    settingViewModel = viewModel,
+                    onDismiss = {
+                        onDismiss()
+                        this.dismiss()
+                    }
+                )
             }
         }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt
new file mode 100644
index 00000000..c75da832
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt
@@ -0,0 +1,24 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import org.kabiri.android.usbterminal.R
+
+@Composable
+internal fun SettingResetDefaultButton(
+    onClick: () -> Unit
+) {
+    Button(onClick = onClick) {
+        Text(text = stringResource(id = R.string.settings_bt_reset_default))
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun SettingResetDefaultButtonPreview() {
+    SettingResetDefaultButton(onClick = {})
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
index 50e24566..f62d7304 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
 
 /**
@@ -23,4 +24,8 @@ internal class SettingViewModel
         get() = getBaudRate()
 
     fun setNewBaudRate(baudRate: Int) = setBaudRate(baudRate)
+
+    fun resetDefault() {
+        setBaudRate(defaultBaudRate)
+    }
 }
\ No newline at end of file

From 9d01a3dcd390dc98e4f94bde6c3ac384d81aa037 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 19:28:34 +0100
Subject: [PATCH 023/126] feature: annouce saved state after user changes a
 setting value

---
 .../ui/setting/SettingValueItem.kt            | 54 ++++++++++++++-----
 app/src/main/res/values/strings.xml           | 12 ++++-
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
index 32ab5f68..64847c02 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
@@ -15,17 +15,38 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+import org.kabiri.android.usbterminal.ui.setting.SaveState.DEFAULT
+import org.kabiri.android.usbterminal.ui.setting.SaveState.UNSAVED
+import org.kabiri.android.usbterminal.ui.setting.SaveState.SAVED
 
+/**
+ * Enum class to represent the save state of the setting value.
+ * - DEFAULT: the default state of the setting value when it has not been changed
+ * - UNSAVED: the setting value has been changed but not saved
+ * - SAVED: the setting value has been saved
+ */
+private enum class SaveState {
+    DEFAULT, UNSAVED, SAVED
+}
+
+/**
+ * A composable that represents a setting item with a value that can be changed.
+ *
+ * @param currentValue the current value of the setting
+ * @param onNewValue a callback that will be called when a new value is set
+ */
 @Composable
 internal fun SettingValueItem(
     currentValue: Int,
     onNewValue: (Int) -> Unit
 ) {
     var inputValue by remember { mutableStateOf(currentValue.toString()) }
-    var showSaveIcon by remember { mutableStateOf(false) }
+    var saveState by remember { mutableStateOf(DEFAULT) }
 
     // keep baudRateInput updated with currentBaudRate
     LaunchedEffect(currentValue) {
@@ -35,25 +56,34 @@ internal fun SettingValueItem(
     OutlinedTextField(
         value = inputValue,
         onValueChange = { value: String ->
+            saveState = if (value.toIntOrNull() != currentValue) UNSAVED else DEFAULT
             inputValue = value
-            showSaveIcon = value.toIntOrNull() != currentValue
         },
-        label = { Text("Baud Rate") },
+        label = { Text(stringResource(id = R.string.settings_label_baud_rate)) },
         singleLine = true,
         modifier = Modifier
             .fillMaxWidth()
             .padding(16.dp),
         trailingIcon = {
-            if (showSaveIcon) {
-                IconButton(onClick = {
-                    inputValue.toIntOrNull()?.let { baudRate ->
-                        onNewValue(baudRate)
-                        showSaveIcon = false
+            when (saveState) {
+                DEFAULT -> {}
+                UNSAVED -> {
+                    IconButton(onClick = {
+                        inputValue.toIntOrNull()?.let { baudRate ->
+                            onNewValue(baudRate)
+                            saveState = SAVED
+                        }
+                    }) {
+                        Icon(
+                            imageVector = Icons.Outlined.Check,
+                            contentDescription = stringResource(id = R.string.settings_bt_save)
+                        )
                     }
-                }) {
-                    Icon(
-                        imageVector = Icons.Outlined.Check,
-                        contentDescription = "Save"
+                }
+                SAVED -> {
+                    Text(
+                        text = stringResource(id = R.string.settings_label_saved),
+                        modifier = Modifier.padding(end = 16.dp)
                     )
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6a19d89..7cc0f109 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,13 @@
     <string name="home_bt_enter">Enter</string>
     <string name="home_et_hint">Type a command …</string>
 
+    <!-- Settings Screen -->
+    <string name="settings_title">Settings</string>
+    <string name="settings_bt_reset_default">Default</string>
+    <string name="settings_bt_save">Save</string>
+    <string name="settings_label_baud_rate">Baud Rate</string>
+    <string name="settings_label_saved">Saved</string>
+
     <!-- Joystick Screen (upcoming) -->
     <string name="bt_joystick_forward">Go Forward</string>
     <string name="bt_joystick_left">Turn Left</string>
@@ -31,11 +38,14 @@
     <string name="helper_error_connection_failed_to_open_unknown">Failed to open device connection.\n</string>
     <string name="helper_error_connection_not_ready_to_close">No device connection to close\n</string>
     <string name="helper_error_connection_failed_to_close">Device connection failed to close\n</string>
-    <string name="helper_error_updating_baud_rate">Failed to update baud rate…\n</string>
+    <string name="helper_error_applying_baud_rate">Failed to apply baud rate…\n</string>
+    <string name="helper_error_baud_rate_failed_to_apply_no_connection">Please connect an Arduino via USB and click on the USB connection button to connect.\n</string>
     <string name="helper_info_serial_connection_opened">Serial Connection Opened\n</string>
     <string name="helper_info_serial_connection_closed">Serial Connection Closed\n</string>
     <string name="helper_info_usb_permission_requested">Requested permission to access the USB device…\n</string>
     <string name="helper_info_checking_attached_usb_devices">Checking attached USB devices…\n</string>
+    <string name="helper_info_baud_rate_applying">Baud rate: %d (can be changed in settings)\n</string>
+    <string name="helper_info_baud_rate_applied">Baud rate applied successfully: %d\n</string>
 
     <string name="breceiver_info_usb_permission_granted">"Permission granted for: \n"</string>
     <string name="breceiver_error_usb_permission_denied">permission denied for device:\n</string>

From ff090695740d468539317a2a3f6485e163fa5858 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:03:00 +0100
Subject: [PATCH 024/126] feature: add a settings header and hints to the
 setting sheet for better ux

---
 .../usbterminal/ui/setting/SettingContent.kt  | 15 +++-
 .../ui/setting/SettingResetDefaultButton.kt   | 24 ------
 .../SettingResetOrDismissSheetButtonRow.kt    | 77 +++++++++++++++++++
 .../usbterminal/ui/setting/SettingsHeader.kt  | 56 ++++++++++++++
 app/src/main/res/values/strings.xml           |  3 +
 5 files changed, 148 insertions(+), 27 deletions(-)
 delete mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetOrDismissSheetButtonRow.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingsHeader.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
index 4fa8b299..94de228f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingContent.kt
@@ -1,10 +1,13 @@
 package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 
 @Composable
@@ -17,6 +20,9 @@ internal fun SettingContent(
 
     Column(modifier = modifier) {
 
+        // Settings Header
+        SettingsHeader()
+
         // Baud Rate Setting
         SettingValueItem(
             currentValue = currentBaudRate,
@@ -24,12 +30,15 @@ internal fun SettingContent(
         )
 
         // Reset Default Button
-        SettingResetDefaultButton(
-            onClick = {
+        SettingResetOrDismissSheetButtonRow(
+            onClickReset = {
                 settingViewModel.resetDefault()
                 onDismiss()
-            }
+            },
+            onClickDismiss = onDismiss
         )
+
+        Spacer(modifier = Modifier.height(8.dp))
     }
 }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt
deleted file mode 100644
index c75da832..00000000
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetDefaultButton.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.kabiri.android.usbterminal.ui.setting
-
-import androidx.compose.material3.Button
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import org.kabiri.android.usbterminal.R
-
-@Composable
-internal fun SettingResetDefaultButton(
-    onClick: () -> Unit
-) {
-    Button(onClick = onClick) {
-        Text(text = stringResource(id = R.string.settings_bt_reset_default))
-    }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun SettingResetDefaultButtonPreview() {
-    SettingResetDefaultButton(onClick = {})
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetOrDismissSheetButtonRow.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetOrDismissSheetButtonRow.kt
new file mode 100644
index 00000000..3531d8e1
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingResetOrDismissSheetButtonRow.kt
@@ -0,0 +1,77 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import android.content.res.Configuration.UI_MODE_NIGHT_NO
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+@Composable
+internal fun SettingResetOrDismissSheetButtonRow(
+    onClickReset: () -> Unit,
+    onClickDismiss: () -> Unit,
+) {
+    Column(modifier = Modifier.padding(16.dp)) {
+
+        Row {
+
+            OutlinedButton(onClick = onClickReset) {
+                Text(text = stringResource(id = R.string.settings_bt_reset_default))
+            }
+
+            Spacer(modifier = Modifier.weight(1f))
+
+            Button(onClick = onClickDismiss) {
+                Text(text = stringResource(id = R.string.settings_bt_dismiss_sheet))
+            }
+        }
+
+        Spacer(modifier = Modifier.padding(4.dp))
+
+        Text(
+            text = stringResource(id = R.string.settings_bottom_text),
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onPrimary,
+        )
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES
+)
+@Composable
+fun SettingResetDefaultButtonPreviewNight() {
+    UsbTerminalTheme {
+        SettingResetOrDismissSheetButtonRow(
+            onClickReset = {},
+            onClickDismiss = {},
+        )
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_NO
+)
+@Composable
+fun SettingResetDefaultButtonPreviewDay() {
+    UsbTerminalTheme {
+        SettingResetOrDismissSheetButtonRow(
+            onClickReset = {},
+            onClickDismiss = {},
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingsHeader.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingsHeader.kt
new file mode 100644
index 00000000..3cc741f1
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingsHeader.kt
@@ -0,0 +1,56 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import android.content.res.Configuration.UI_MODE_NIGHT_NO
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+@Composable
+fun SettingsHeader() {
+
+    Column(modifier = Modifier.padding(16.dp)) {
+
+        Text(
+            text = stringResource(id = R.string.settings_title),
+            style = MaterialTheme.typography.headlineLarge,
+            color = MaterialTheme.colorScheme.onPrimary,
+        )
+
+        Text(
+            text = stringResource(id = R.string.settings_subtitle),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onPrimary,
+        )
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES,
+)
+@Composable
+fun SettingsHeaderPreviewNight() {
+    UsbTerminalTheme {
+        SettingsHeader()
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_NO,
+)
+@Composable
+fun SettingsHeaderPreviewDay() {
+    UsbTerminalTheme {
+        SettingsHeader()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cc0f109..47fc0f75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,10 @@
 
     <!-- Settings Screen -->
     <string name="settings_title">Settings</string>
+    <string name="settings_subtitle">Type a new value to change setting values</string>
+    <string name="settings_bottom_text">Attention: Clicking on the Default button will quickly reset the settings to their default values.</string>
     <string name="settings_bt_reset_default">Default</string>
+    <string name="settings_bt_dismiss_sheet">Close</string>
     <string name="settings_bt_save">Save</string>
     <string name="settings_label_baud_rate">Baud Rate</string>
     <string name="settings_label_saved">Saved</string>

From 429ad379f6c873d84e4e11627cb1ca63422eb475 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:12:05 +0100
Subject: [PATCH 025/126] feature: save settings and dismiss soft keyboard on
 ime action

---
 .../ui/setting/SettingValueItem.kt            | 25 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
index 64847c02..928e24c1 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
@@ -2,6 +2,7 @@ package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material3.Icon
@@ -14,7 +15,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -40,6 +43,7 @@ private enum class SaveState {
  * @param currentValue the current value of the setting
  * @param onNewValue a callback that will be called when a new value is set
  */
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun SettingValueItem(
     currentValue: Int,
@@ -47,6 +51,15 @@ internal fun SettingValueItem(
 ) {
     var inputValue by remember { mutableStateOf(currentValue.toString()) }
     var saveState by remember { mutableStateOf(DEFAULT) }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    fun onClickSaveNewValue(baudRate: Int) {
+        inputValue.toIntOrNull()?.let { baudRate ->
+            onNewValue(baudRate)
+            saveState = SAVED
+            keyboardController?.hide()
+        }
+    }
 
     // keep baudRateInput updated with currentBaudRate
     LaunchedEffect(currentValue) {
@@ -69,10 +82,7 @@ internal fun SettingValueItem(
                 DEFAULT -> {}
                 UNSAVED -> {
                     IconButton(onClick = {
-                        inputValue.toIntOrNull()?.let { baudRate ->
-                            onNewValue(baudRate)
-                            saveState = SAVED
-                        }
+                        onClickSaveNewValue(inputValue.toInt())
                     }) {
                         Icon(
                             imageVector = Icons.Outlined.Check,
@@ -88,7 +98,12 @@ internal fun SettingValueItem(
                 }
             }
         },
-        isError = inputValue.toIntOrNull() == null
+        isError = inputValue.toIntOrNull() == null,
+        keyboardActions = KeyboardActions(
+            onDone = {
+                onClickSaveNewValue(inputValue.toInt())
+            }
+        )
     )
 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47fc0f75..9623d35a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
 
     <!-- Settings Screen -->
     <string name="settings_title">Settings</string>
-    <string name="settings_subtitle">Type a new value to change setting values</string>
+    <string name="settings_subtitle">Type a new value and click on the checkmark to save it.</string>
     <string name="settings_bottom_text">Attention: Clicking on the Default button will quickly reset the settings to their default values.</string>
     <string name="settings_bt_reset_default">Default</string>
     <string name="settings_bt_dismiss_sheet">Close</string>

From 0f63234f07802f86da8ff8b4da0114ff9e320479 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:15:53 +0100
Subject: [PATCH 026/126] feature: listen for baudrate changes made by the user

---
 .../usbterminal/arduino/ArduinoHelper.kt      | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 93d9d673..e6efedc5 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -43,32 +43,6 @@ internal class ArduinoHelper
 
     private var currentBaudRate = defaultBaudRate // Default value
 
-    init {
-        observeBaudRate()
-    }
-
-    private fun observeBaudRate() {
-        CoroutineScope(Dispatchers.IO).launch {
-            getBaudRate().collect { baudRate ->
-                currentBaudRate = baudRate
-                Log.d(TAG, "custom baud rate set = $baudRate")
-                if (::serialPort.isInitialized) {
-                    updateSerialPortBaudRate(baudRate)
-                }
-            }
-        }
-    }
-
-    private fun updateSerialPortBaudRate(baudRate: Int) {
-        try {
-            Log.d(TAG, "updateSerialPortBaudRate, current baud rate = $currentBaudRate")
-            serialPort.setBaudRate(baudRate)
-        } catch (e: Exception) {
-            Log.e(TAG, "Error updating baud rate: ${e.message}")
-            _liveErrorOutput.value = context.getString(R.string.helper_error_updating_baud_rate)
-        }
-    }
-
     private val _liveOutput = MutableStateFlow("")
     val output: Flow<String>
         get() = _liveOutput
@@ -91,6 +65,10 @@ internal class ArduinoHelper
     private lateinit var connection: UsbDeviceConnection
     private lateinit var serialPort: UsbSerialDevice
 
+    init {
+        observeBaudRate()
+    }
+
     /**
      * register the Arduino Permission Broadcast Receiver.
      */
@@ -231,4 +209,36 @@ internal class ArduinoHelper
             false
         }
     }
+
+    /**
+     * Listen for changes in baudRate set by the user
+     */
+    private fun observeBaudRate() {
+        CoroutineScope(Dispatchers.IO).launch {
+            getBaudRate().collect { baudRate ->
+                currentBaudRate = baudRate
+                _liveInfoOutput.value = String.format(
+                    context.getString(R.string.helper_info_baud_rate_applying), baudRate)
+                if (::serialPort.isInitialized) {
+                    updateSerialPortBaudRate(baudRate)
+                    _liveInfoOutput.value = String.format(
+                        context.getString(R.string.helper_info_baud_rate_applied), baudRate)
+                } else {
+                    _liveErrorOutput.value =
+                        context.getString(R.string.helper_error_baud_rate_failed_to_apply_no_connection)
+                }
+            }
+        }
+    }
+
+    /**
+     * Update value of current baud rate to new one from the user
+     */
+    private fun updateSerialPortBaudRate(baudRate: Int) {
+        try {
+            serialPort.setBaudRate(baudRate)
+        } catch (e: Exception) {
+            _liveErrorOutput.value = context.getString(R.string.helper_error_applying_baud_rate)
+        }
+    }
 }
\ No newline at end of file

From 8a9e21e39a2de0b04432586de2fd04a6ea678fd2 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:32:15 +0100
Subject: [PATCH 027/126] ci: hopefully fix build by updating to zulu 17

---
 .github/workflows/android.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6a96ad37..91d44da3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -12,11 +12,11 @@ jobs:
       with:
         ruby-version: '3.0'
         bundler-cache: true
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v1
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: '17'
     - name: Cache Gradle wrapper
       uses: actions/cache@v3
       with:
@@ -51,11 +51,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: generate ksProp file
         run: ./gradlew generateKsPropFile
       - name: generate google-services.json file
@@ -75,11 +75,11 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: generate ksProp file
         run: ./gradlew generateKsPropFile
       - name: generate google-services.json file

From cd5892ec05f023c556106a6c036b8fb6f1f0a7f7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:45:03 +0100
Subject: [PATCH 028/126] ci: hopefully fix circleci build

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 29704536..4aa4e35d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ commands:
 executors:
   android-machine:
     machine:
-      image: android:2022.12.1
+      image: android:2024.01.1
   android-docker:
     docker:
       - image: cimg/android:2023.02

From 1bf07c77c0ba40720d0a03e9e55da2b700937815 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 20:49:57 +0100
Subject: [PATCH 029/126] ci: hopefully fix the circleci docker version to
 another one which supports java 17

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4aa4e35d..b2e0a882 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ executors:
       image: android:2024.01.1
   android-docker:
     docker:
-      - image: cimg/android:2023.02
+      - image: cimg/android:2024.01
 
 jobs:
   android-test:

From f5d1aec124a440c9d5d8c1dd1abd04757dd51e22 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:07:29 +0100
Subject: [PATCH 030/126] refactor: remove unused composable

---
 app/src/main/res/layout/activity_main.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 632635d9..36d8ba6b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,22 +16,13 @@
         android:gravity="bottom"
         android:scrollbars="vertical"
         android:text="@{viewModel.output}"
-        app:layout_constraintBottom_toTopOf="@+id/composeView"
+        app:layout_constraintBottom_toTopOf="@id/etInput"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/composeView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/etInput"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvOutput" />
-
     <Button
         android:id="@+id/btEnter"
         android:layout_width="wrap_content"

From e18c8aa0c4b565d4881f4b8e588d215c9aeb4c50 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:07:50 +0100
Subject: [PATCH 031/126] chore: update fastlane

---
 Gemfile.lock      | 5 ++++-
 fastlane/Fastfile | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 828e3551..47494ae1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.5.0)
+    fastlane-plugin-firebase_app_distribution (0.7.4)
+      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -118,6 +119,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
+    google-apis-firebaseappdistribution_v1 (0.3.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 55576645..5e1fd394 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -29,7 +29,13 @@ platform :android do
 
   desc "Deploy to Firebase AppTester channel"
   lane :distDev do
-    gradle(task: "generateKsPropFile generateGoogleServicesJson generateAppDistKey clean assembleDebug")
+    gradle(tasks: [
+        "generateKsPropFile",
+        "generateGoogleServicesJson",
+        "generateAppDistKey",
+        "clean",
+        "assembleDebug"
+    ])
     firebase_app_distribution(
         service_credentials_file: ENV['APP_DIST_SERVICE_ACCOUNT_PATH'],
         app: "1:1032339097117:android:1e333da555ec74a71668f4",

From 266e506790c3caaa41eb12136a682c3760f33943 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:11:39 +0100
Subject: [PATCH 032/126] chore: bump version name

---
 app/build.gradle.kts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7e6af0e1..3449f30e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -40,7 +40,7 @@ android {
         minSdk = 23
         targetSdk = 33
         versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 13
-        versionName = "0.9.12${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
+        versionName = "0.9.84${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -143,10 +143,10 @@ tasks.register("generateKsPropFile") {
             createNewFile()
             writeText("""
                 # Gradle signing properties for app module
-                release.file=${System.getenv("KS_PATH")}
-                release.storePassword=${System.getenv("KS_PASSWORD")}
-                release.keyAlias=${System.getenv("KS_KEY_ALIAS")}
-                release.keyPassword=${System.getenv("KS_KEY_PASSWORD")}
+                release.file=${System.getenv("USB_TERMINAL_KS_PATH")}
+                release.storePassword=${System.getenv("USB_TERMINAL_KS_PASSWORD")}
+                release.keyAlias=${System.getenv("USB_TERMINAL_KS_KEY_ALIAS")}
+                release.keyPassword=${System.getenv("USB_TERMINAL_KS_KEY_PASSWORD")}
                 """.trimIndent())
             println("generated ${this.path}")
         }

From 98fffc22e1b6aa22aedcc0591f3c05e8874dc29e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:22:33 +0100
Subject: [PATCH 033/126] chore: update fastlane

---
 Gemfile.lock | 80 +++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 47494ae1..2b3cda74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.873.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.904.0)
+    aws-sdk-core (3.191.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -32,10 +35,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.108.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,7 +68,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.0)
-    fastlane (2.217.0)
+    fastlane (2.218.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -92,7 +95,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -108,40 +111,40 @@ GEM
     fastlane-plugin-firebase_app_distribution (0.7.4)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.2)
+    google-apis-androidpublisher_v3 (0.59.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-core (0.14.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-firebaseappdistribution_v1 (0.3.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.29.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-apis-iamcredentials_v1 (0.20.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.15.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-storage_v1 (0.37.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.0)
+    google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.45.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.49.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-core (~> 0.13)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (~> 0.33)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.9.1)
+    googleauth (1.11.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -154,16 +157,18 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.7.1)
-    jwt (2.7.1)
+    jwt (2.8.1)
+      base64
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    nkf (0.2.0)
+    optparse (0.4.0)
     os (1.1.4)
-    plist (3.7.0)
+    plist (3.7.1)
     public_suffix (5.0.4)
     rake (13.1.0)
     representable (3.2.0)
@@ -176,7 +181,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -194,9 +199,8 @@ GEM
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 5dd82dd7008bb4f891fc34e61b8d4e929ac7837a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:45:11 +0100
Subject: [PATCH 034/126] ci: add a circleci job to push the release build to
 playstore internal release

---
 .circleci/config.yml | 16 ++++++++++++++++
 app/build.gradle.kts | 12 ++++++++++++
 fastlane/Fastfile    | 10 ++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2e0a882..02796e96 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -70,6 +70,22 @@ jobs:
           path: /home/circleci/project/app/build/outputs/apk/debug/app-debug.apk
           destination: fastlane-output-debug
 
+  distribute-internal-testing:
+    executor: android-docker
+    resource_class: large
+    steps:
+      - checkout
+      - restore_gradle_cache
+      - run:
+          name: Prepare Fastlane
+          command: sudo bundle update
+      - run:
+          name: Distribute to Firebase AppTester
+          command: bundle exec fastlane deploy
+      - store_artifacts:
+          path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
+          destination: fastlane-output-release
+
 workflows:
   workflow:
     jobs:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3449f30e..6585c36d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -165,6 +165,18 @@ tasks.register("generateAppDistKey") {
     }
 }
 
+tasks.register("generateInternalReleaseKey") {
+    doLast {
+        val jsonFileName = "internal-release-key.json"
+        val fileContent = System.getenv("SERVICE_ACCOUNT_USB_TERMINAL_PLAY_STORE_RAW")
+        File(rootDir, jsonFileName).apply {
+            createNewFile()
+            writeText(fileContent)
+            println("generated ${this.path}")
+        }
+    }
+}
+
 fun loadKeyStore(name: String): Properties? {
     val ksProp = Properties()
     val ksPropFile = file(name)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5e1fd394..c78961bb 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -55,10 +55,12 @@ platform :android do
 
   desc "Deploy a new version to the Google Play"
   lane :deploy do
-    gradle(
-        task: 'bundle',
-        build_type: 'Release'
-    )
+    gradle(tasks: [
+        "generateKsPropFile",
+        "generateGoogleServicesJson",
+        "generateInternalReleaseKey",
+        "bundleRelease"
+    ])
     upload_to_play_store(
              track: 'internal',
              release_status: 'draft',

From e8dc2a5b1310ee639f32765992fbfe1e800fbbe5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:45:53 +0100
Subject: [PATCH 035/126] chore: activate the distribute-internal-testing job

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02796e96..273a8e13 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,3 +92,4 @@ workflows:
       - android-test:
           context: SonarCloud
       - distribute-dev
+      - distribute-internal-testing

From 8844007504ad3b4ba6675a8ae49c213cd1408e26 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:59:35 +0100
Subject: [PATCH 036/126] chore: bump version code

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6585c36d..13400446 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,7 +39,7 @@ android {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 23
         targetSdk = 33
-        versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 13
+        versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 14
         versionName = "0.9.84${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

From 51eae6d69117425effdb40af1b71c812f737fb7b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 21:59:47 +0100
Subject: [PATCH 037/126] chore: update fastlane plugins

---
 Gemfile.lock | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2b3cda74..172fbb66 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,8 +108,9 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.7.4)
+    fastlane-plugin-firebase_app_distribution (0.9.0)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
+      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.59.0)
       google-apis-core (>= 0.14.0, < 2.a)
@@ -123,6 +124,8 @@ GEM
       rexml
     google-apis-firebaseappdistribution_v1 (0.3.0)
       google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-firebaseappdistribution_v1alpha (0.2.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-iamcredentials_v1 (0.20.0)
       google-apis-core (>= 0.14.0, < 2.a)
     google-apis-playcustomapp_v1 (0.15.0)

From abdd4c06183e67217ada4f7f59c235ef55655e0e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 22:21:34 +0100
Subject: [PATCH 038/126] chore: hopefully fix automated upload to playstore
 internal release

---
 app/build.gradle.kts | 14 ++++++++++++++
 fastlane/Fastfile    |  1 +
 2 files changed, 15 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 13400446..44c405ba 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -136,6 +136,20 @@ tasks.register("generateGoogleServicesJson") {
     }
 }
 
+tasks.register("generateKsFile") {
+    doLast {
+        val jsonFileName = "bad.json"
+        val encodedFileContent = System.getenv("KS_USB_TERMINAL_PLAY_STORE_RAW")
+        val decodedBytes = Base64.getDecoder().decode(encodedFileContent)
+        val fileContent = String(decodedBytes)
+        File(rootDir, jsonFileName).apply {
+            createNewFile()
+            writeText(fileContent)
+            println("generated ${this.path}")
+        }
+    }
+}
+
 tasks.register("generateKsPropFile") {
     doLast {
         val configFileName = "keystore.properties"
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c78961bb..d4a72052 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -56,6 +56,7 @@ platform :android do
   desc "Deploy a new version to the Google Play"
   lane :deploy do
     gradle(tasks: [
+        "generateKsFile",
         "generateKsPropFile",
         "generateGoogleServicesJson",
         "generateInternalReleaseKey",

From 91d2fd52309cebc09313e0b92bf8d690fce4b933 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 22:32:41 +0100
Subject: [PATCH 039/126] chore: hopefully fix automated push to playstore
 internal release lane

---
 .circleci/config.yml | 2 +-
 app/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 273a8e13..0143d67f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
           name: Prepare Fastlane
           command: sudo bundle update
       - run:
-          name: Distribute to Firebase AppTester
+          name: Distribute to Google PlayStore Internal Testing
           command: bundle exec fastlane deploy
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 44c405ba..5853b09c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -142,7 +142,7 @@ tasks.register("generateKsFile") {
         val encodedFileContent = System.getenv("KS_USB_TERMINAL_PLAY_STORE_RAW")
         val decodedBytes = Base64.getDecoder().decode(encodedFileContent)
         val fileContent = String(decodedBytes)
-        File(rootDir, jsonFileName).apply {
+        File(projectDir, jsonFileName).apply {
             createNewFile()
             writeText(fileContent)
             println("generated ${this.path}")

From fa7797d18af31c138d73d38b08bf41560b03c03a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 23:05:08 +0100
Subject: [PATCH 040/126] chore: hopefully fix the google play upload

---
 app/build.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5853b09c..c3f2cd25 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -141,10 +141,9 @@ tasks.register("generateKsFile") {
         val jsonFileName = "bad.json"
         val encodedFileContent = System.getenv("KS_USB_TERMINAL_PLAY_STORE_RAW")
         val decodedBytes = Base64.getDecoder().decode(encodedFileContent)
-        val fileContent = String(decodedBytes)
         File(projectDir, jsonFileName).apply {
             createNewFile()
-            writeText(fileContent)
+            writeBytes(decodedBytes)
             println("generated ${this.path}")
         }
     }

From 826903cb6e951ed71d3dfdd66acd1132d7c94ff4 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 23:22:24 +0100
Subject: [PATCH 041/126] chore: hopefully fix the google play upload

---
 fastlane/Fastfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d4a72052..e3b42dc0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -73,9 +73,5 @@ platform :android do
              skip_upload_screenshots: 'true',
              json_key: ENV['SERVICE_ACCOUNT_USB_TERMINAL_PLAY_STORE']
     )
-#     upload_to_play_store_internal_app_sharing(
-#         aab: './app/build/outputs/bundle/release/app-release.aab',
-#         json_key: ENV['SERVICE_ACCOUNT_USB_TERMINAL_PLAY_STORE']
-#     )
   end
 end

From eaa1afb5218d231c0e19ebcc4a4432fd8a25aa19 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Mar 2024 23:27:26 +0100
Subject: [PATCH 042/126] chore: hopefully fix the google play upload

---
 fastlane/Fastfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e3b42dc0..222a3f41 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -60,8 +60,11 @@ platform :android do
         "generateKsPropFile",
         "generateGoogleServicesJson",
         "generateInternalReleaseKey",
-        "bundleRelease"
     ])
+    gradle(
+        task: "bundle",
+        build_type: "Release",
+    )
     upload_to_play_store(
              track: 'internal',
              release_status: 'draft',

From b0faabad90455250a26487c0cde0b680d1a38f8e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Mar 2024 00:20:48 +0100
Subject: [PATCH 043/126] bugfix: allow only numbers as an input for the baud
 rate

---
 .../ui/setting/SettingValueItem.kt            | 28 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
index 928e24c1..96eb2524 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
@@ -3,6 +3,7 @@ package org.kabiri.android.usbterminal.ui.setting
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material3.Icon
@@ -19,6 +20,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.kabiri.android.usbterminal.R
@@ -26,15 +28,17 @@ import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
 import org.kabiri.android.usbterminal.ui.setting.SaveState.DEFAULT
 import org.kabiri.android.usbterminal.ui.setting.SaveState.UNSAVED
 import org.kabiri.android.usbterminal.ui.setting.SaveState.SAVED
+import org.kabiri.android.usbterminal.ui.setting.SaveState.ERROR
 
 /**
  * Enum class to represent the save state of the setting value.
  * - DEFAULT: the default state of the setting value when it has not been changed
  * - UNSAVED: the setting value has been changed but not saved
  * - SAVED: the setting value has been saved
+ * - ERROR: the setting value is invalid
  */
 private enum class SaveState {
-    DEFAULT, UNSAVED, SAVED
+    DEFAULT, UNSAVED, SAVED, ERROR,
 }
 
 /**
@@ -53,7 +57,7 @@ internal fun SettingValueItem(
     var saveState by remember { mutableStateOf(DEFAULT) }
     val keyboardController = LocalSoftwareKeyboardController.current
 
-    fun onClickSaveNewValue(baudRate: Int) {
+    fun onClickSaveNewValue() {
         inputValue.toIntOrNull()?.let { baudRate ->
             onNewValue(baudRate)
             saveState = SAVED
@@ -69,6 +73,11 @@ internal fun SettingValueItem(
     OutlinedTextField(
         value = inputValue,
         onValueChange = { value: String ->
+            val input = value.toIntOrNull()
+            if (input == null) {
+                saveState = ERROR
+                return@OutlinedTextField
+            }
             saveState = if (value.toIntOrNull() != currentValue) UNSAVED else DEFAULT
             inputValue = value
         },
@@ -82,7 +91,7 @@ internal fun SettingValueItem(
                 DEFAULT -> {}
                 UNSAVED -> {
                     IconButton(onClick = {
-                        onClickSaveNewValue(inputValue.toInt())
+                        onClickSaveNewValue()
                     }) {
                         Icon(
                             imageVector = Icons.Outlined.Check,
@@ -96,14 +105,21 @@ internal fun SettingValueItem(
                         modifier = Modifier.padding(end = 16.dp)
                     )
                 }
+                ERROR -> {
+                    Text(
+                        text = stringResource(id = R.string.settings_label_error),
+                        modifier = Modifier.padding(end = 16.dp)
+                    )
+                }
             }
         },
-        isError = inputValue.toIntOrNull() == null,
+        isError = saveState == ERROR,
+        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
         keyboardActions = KeyboardActions(
             onDone = {
-                onClickSaveNewValue(inputValue.toInt())
+                onClickSaveNewValue()
             }
-        )
+        ),
     )
 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9623d35a..2b57fa74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="settings_bt_save">Save</string>
     <string name="settings_label_baud_rate">Baud Rate</string>
     <string name="settings_label_saved">Saved</string>
+    <string name="settings_label_error">Enter a Number</string>
 
     <!-- Joystick Screen (upcoming) -->
     <string name="bt_joystick_forward">Go Forward</string>

From 0ebc0d65a7d70269bb7914d378a54467240db6b2 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 1 Apr 2024 16:03:22 +0200
Subject: [PATCH 044/126] deps: update firebase and crashlytics

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index c44ecfcd..11c4f923 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         coroutines_version = "1.6.4"
-        firebase_bom_version = "30.5.0"
+        firebase_bom_version = "32.8.0"
         hilt_version = "2.44"
         jacoco_version = "0.8.8"
         kotlin_version = "1.8.10"
@@ -9,8 +9,8 @@ buildscript {
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath "com.google.gms:google-services:4.3.15"
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.7"
+        classpath "com.google.gms:google-services:4.4.1"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
     }
 }
 

From b2fd55c0b8de1716c5817576908a216409f9586e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 6 Apr 2024 10:40:30 +0200
Subject: [PATCH 045/126] bugfix: fixed a crash when closing connection

---
 .../org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index e6efedc5..d4ee42b3 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -159,7 +159,7 @@ internal class ArduinoHelper
             prepareSerialPort(serialPort)
         else {
             _liveInfoOutput.value = context.getString(R.string.helper_error_serial_port_is_null)
-            connection.close()
+            if (::connection.isInitialized) connection.close()
         }
     }
 

From 168649f7286597a6e5e945585ee28b8f1cbb2bb5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 6 Apr 2024 11:57:45 +0200
Subject: [PATCH 046/126] refactor: remove extra OptIn annotations

---
 .../data/repository/UserSettingRepositoryAndroidTest.kt         | 2 --
 .../usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt   | 1 -
 .../usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt   | 2 --
 .../main/java/org/kabiri/android/usbterminal/MainActivity.kt    | 2 --
 4 files changed, 7 deletions(-)

diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
index 91e246bd..de19d3ae 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
@@ -8,7 +8,6 @@ import androidx.datastore.preferences.preferencesDataStoreFile
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -20,7 +19,6 @@ import org.junit.runner.RunWith
 import org.kabiri.android.usbterminal.model.UserSettingPreferences
 
 private const val TEST_DATA_STORE_NAME = "test_data_store"
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(AndroidJUnit4::class)
 class UserSettingRepositoryAndroidTest {
 
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
index 1abbd08f..f43f06ca 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
@@ -8,7 +8,6 @@ import org.junit.Test
 import org.kabiri.android.usbterminal.common.getFakeUserSettingRepository
 import org.kabiri.android.usbterminal.model.UserSettingPreferences
 
-@OptIn(ExperimentalCoroutinesApi::class)
 internal class GetCustomBaudRateUseCaseAndroidTest {
 
     @Test
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
index 913227fd..eb8ad349 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
@@ -1,12 +1,10 @@
 package org.kabiri.android.usbterminal.domain
 
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.kabiri.android.usbterminal.common.getFakeUserSettingRepository
 
-@OptIn(ExperimentalCoroutinesApi::class)
 internal class SetCustomBaudRateUseCaseAndroidTest {
 
     @Test
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 0b580f79..b1d43b90 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -12,7 +12,6 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
@@ -20,7 +19,6 @@ import org.kabiri.android.usbterminal.ui.setting.SettingModalBottomSheet
 import org.kabiri.android.usbterminal.ui.setting.SettingViewModel
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
 
-@OptIn(ExperimentalMaterial3Api::class)
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 

From 3990a972744b1403abdeb34d50d2c1b515f76bde Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 6 Apr 2024 11:58:19 +0200
Subject: [PATCH 047/126] bugfix: check if connection is initialized before
 closing it

---
 .../org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index d4ee42b3..1d1e4d82 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -98,7 +98,7 @@ internal class ArduinoHelper
 
     fun disconnect() {
         try {
-            connection.close()
+            if (::connection.isInitialized) connection.close()
             _liveOutput.value = context.getString(R.string.helper_info_serial_connection_closed)
         } catch (e: UninitializedPropertyAccessException) {
             _liveErrorOutput.value =

From 3b4876ac311b642faf40a1d6ec6d8fe0933bac2d Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 6 Apr 2024 12:13:00 +0200
Subject: [PATCH 048/126] tests: move scope to constructor for testability

---
 .../domain/GetCustomBaudRateUseCaseAndroidTest.kt        | 1 -
 .../domain/SetCustomBaudRateUseCaseAndroidTest.kt        | 9 +++++++--
 .../usbterminal/domain/SetCustomBaudRateUseCase.kt       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
index f43f06ca..82a33ac1 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/GetCustomBaudRateUseCaseAndroidTest.kt
@@ -1,7 +1,6 @@
 package org.kabiri.android.usbterminal.domain
 
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
index eb8ad349..6bfb8143 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCaseAndroidTest.kt
@@ -1,10 +1,13 @@
 package org.kabiri.android.usbterminal.domain
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.kabiri.android.usbterminal.common.getFakeUserSettingRepository
 
+@OptIn(ExperimentalCoroutinesApi::class)
 internal class SetCustomBaudRateUseCaseAndroidTest {
 
     @Test
@@ -16,11 +19,13 @@ internal class SetCustomBaudRateUseCaseAndroidTest {
             isCalledSetBaudRate = true
         })
         val sut = SetCustomBaudRateUseCase(
-            userSettingRepository = fakeUserSettingRepository
+            userSettingRepository = fakeUserSettingRepository,
+            scope = this,
         )
 
         // act
-        sut(123)
+        sut.invoke(123)
+        advanceUntilIdle()
 
         // assert
         assertThat(isCalledSetBaudRate).isTrue()
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
index 39f70280..50f9ee5a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/SetCustomBaudRateUseCase.kt
@@ -13,9 +13,9 @@ internal fun interface ISetCustomBaudRateUseCase {
 internal class SetCustomBaudRateUseCase
 @Inject constructor(
     private val userSettingRepository: IUserSettingRepository,
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
 ): ISetCustomBaudRateUseCase {
 
-    private val scope = CoroutineScope(Dispatchers.IO)
     override fun invoke(baudRate: Int) {
         scope.launch {
             userSettingRepository.setBaudRate(baudRate)

From 70e05e51cd7b5b18c21c77e111a7fe70edfe293c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 6 Apr 2024 12:13:36 +0200
Subject: [PATCH 049/126] deps: update lifecycle, coroutines, and compose

---
 app/build.gradle.kts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c3f2cd25..3e8c0fed 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -222,11 +222,11 @@ dependencies {
     kapt("com.google.dagger:hilt-compiler:$hilt_version")
 
     // Coroutines
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
 
     // Compose Bom
     val composeBom = platform("androidx.compose:compose-bom:2023.06.01")
@@ -237,7 +237,7 @@ dependencies {
     // Compose - Android Studio Preview support
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
-    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation("androidx.activity:activity-compose:1.8.2")
 
     // Other UI Libraries
     implementation("com.google.android.material:material:$material_version")

From 8e669c1d0ade84a4f3b409496c733eb82db35124 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 7 Apr 2024 20:21:31 +0200
Subject: [PATCH 050/126] chore: enable minification

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3e8c0fed..239f0c03 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,7 +61,7 @@ android {
     buildTypes {
         named("release") {
             signingConfig = signingConfigs.findByName("release")
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         named("debug") {

From 0124324ce83ef814321c2877e382f9c255371520 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 7 Apr 2024 20:32:17 +0200
Subject: [PATCH 051/126] ci: push prod build to firebase app tester as well as
 playStore internal testing channel

---
 .circleci/config.yml |  5 ++++-
 fastlane/Fastfile    | 23 ++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0143d67f..5aca1c2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,7 @@ jobs:
           name: Prepare Fastlane
           command: sudo bundle update
       - run:
-          name: Distribute to Firebase AppTester
+          name: Distribute to Firebase AppTester Dev
           command: bundle exec fastlane distDev
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/apk/debug/app-debug.apk
@@ -82,6 +82,9 @@ jobs:
       - run:
           name: Distribute to Google PlayStore Internal Testing
           command: bundle exec fastlane deploy
+      - run:
+          name: Distribute to Firebase AppTester Prod
+          command: bundle exec fastlane distProd
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
           destination: fastlane-output-release
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 222a3f41..445e4f80 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -27,7 +27,7 @@ platform :android do
     gradle(task: "generateKsPropFile generateGoogleServicesJson pixel2api30DebugAndroidTest testDebugUnitTest jacocoTestReport --stacktrace")
   end
 
-  desc "Deploy to Firebase AppTester channel"
+  desc "Deploy to Firebase AppTester Dev channel"
   lane :distDev do
     gradle(tasks: [
         "generateKsPropFile",
@@ -44,6 +44,27 @@ platform :android do
     )
   end
 
+  desc "Deploy to Firebase AppTester Prod channel"
+  lane :distProd do
+    gradle(tasks: [
+        "generateKsFile",
+        "generateKsPropFile",
+        "generateGoogleServicesJson",
+        "generateAppDistKey",
+        "clean",
+    ])
+    gradle(
+        task: "assemble",
+        build_type: "Release",
+    )
+    firebase_app_distribution(
+        service_credentials_file: ENV['APP_DIST_SERVICE_ACCOUNT_PATH'],
+        app: "1:1032339097117:android:1e333da555ec74a71668f4",
+        groups: "testers",
+        release_notes: "prod",
+    )
+  end
+
   desc "Submit a new Beta Build to Crashlytics Beta"
   lane :beta do
     gradle(task: "clean assembleRelease")

From 6e6c57c7c9553b27326e9745b9b7a44bd1eab46c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 8 Apr 2024 20:25:03 +0200
Subject: [PATCH 052/126] bugfix: fix wrong action title

---
 app/src/main/res/menu/activity_main_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/menu/activity_main_menu.xml b/app/src/main/res/menu/activity_main_menu.xml
index 0f6f6869..1f0561ef 100644
--- a/app/src/main/res/menu/activity_main_menu.xml
+++ b/app/src/main/res/menu/activity_main_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/actionSettings" android:title="@string/title_disconnect" app:showAsAction="ifRoom" android:icon="@drawable/ic_baseline_settings_24"/>
+    <item android:id="@+id/actionSettings" android:title="@string/title_settings" app:showAsAction="ifRoom" android:icon="@drawable/ic_baseline_settings_24"/>
     <item android:id="@+id/actionConnect" android:title="@string/title_connect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_white_24dp"/>
     <item android:id="@+id/actionDisconnect" android:title="@string/title_disconnect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_off_white_24dp"/>
 </menu>
\ No newline at end of file

From 80b5d562f1653973692facaf375089e7c33722e7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 8 Apr 2024 20:25:31 +0200
Subject: [PATCH 053/126] feature: allow sending commands on press of enter
 button to use on chromebooks

---
 .../android/usbterminal/MainActivity.kt       | 19 +++++++++++++++++--
 app/src/main/res/layout/activity_main.xml     |  3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index b1d43b90..46bb11b6 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -4,9 +4,11 @@ import android.os.Bundle
 import android.text.SpannableString
 import android.text.method.ScrollingMovementMethod
 import android.util.Log
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
@@ -66,14 +68,27 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        // send the command to device when the button is clicked.
-        btEnter.setOnClickListener {
+        fun sendCommand() {
             val input = etInput.text.toString()
             // append the input to console
             if (viewModel.serialWrite(input))
                 etInput.setText("") // clear the terminal input.
             else Log.e(TAG, "The message was not sent to Arduino")
         }
+
+        // send the command to device when the button is clicked.
+        btEnter.setOnClickListener {
+            sendCommand()
+        }
+
+        etInput.setOnEditorActionListener { _, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEND ||
+                (event?.keyCode == KeyEvent.KEYCODE_ENTER &&
+                        event.action == KeyEvent.ACTION_DOWN)) {
+                sendCommand()
+                true
+            } else false
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 36d8ba6b..99b82e4c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -45,6 +45,7 @@
         android:inputType="textPersonName"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btEnter"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        android:imeOptions="actionSend"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3ab0a47cd77e3c1366a8de958ca7fd5b35dbf94f Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 8 Apr 2024 20:25:42 +0200
Subject: [PATCH 054/126] chore: update gradle

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11c4f923..8cc5ee89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version '8.1.4' apply false
+    id("com.android.application") version '8.2.0' apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("org.sonarqube") version "3.5.0.2730"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c140e0f4..22df0aea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

From 6282e4cbbf8ab4ac7b4a5b074e4110627b9cee52 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Mon, 30 Dec 2024 12:58:56 +0100
Subject: [PATCH 055/126] chore: update bundler packages, fix the build

---
 Gemfile.lock                             | 109 ++++----
 gradle/wrapper/gradle-wrapper.properties |   5 +-
 gradlew                                  | 342 ++++++++++++++---------
 gradlew.bat                              |  78 +++---
 4 files changed, 314 insertions(+), 220 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 172fbb66..947a2ae1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,25 +5,25 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.904.0)
-    aws-sdk-core (3.191.5)
+    aws-partitions (1.1029.0)
+    aws-sdk-core (3.214.1)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.78.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.176.1)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -38,8 +38,8 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -58,16 +58,16 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.0)
+    fastimage (2.3.1)
     fastlane (2.218.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
@@ -108,78 +108,81 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.9.0)
+    fastlane-plugin-firebase_app_distribution (0.9.1)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.59.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-core (0.14.1)
+    google-apis-androidpublisher_v3 (0.75.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
-      httpclient (>= 2.8.1, < 3.a)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
     google-apis-firebaseappdistribution_v1 (0.3.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-firebaseappdistribution_v1alpha (0.2.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iamcredentials_v1 (0.20.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.15.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-storage_v1 (0.37.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-apis-iamcredentials_v1 (0.22.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.16.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.49.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
+    google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-cloud-storage (1.49.0)
+    google-cloud-storage (1.54.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-core (~> 0.13)
       google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.33)
+      google-apis-storage_v1 (~> 0.38)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.11.0)
+    google-logging-utils (0.1.0)
+    googleauth (1.12.2)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.1)
-    jwt (2.8.1)
+    json (2.9.1)
+    jwt (2.10.1)
       base64
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
-    nanaimo (0.3.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.4.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
-    public_suffix (5.0.4)
-    rake (13.1.0)
+    plist (3.7.2)
+    public_suffix (6.0.1)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.4.0)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -201,15 +204,15 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 22df0aea..09523c0e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sun Jan 24 09:56:06 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/gradlew b/gradlew
index 9a27a6ce..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,172 +1,252 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# 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
+#
+#      https://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.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ]; do
-  ls=$(ls -ld "$PRG")
-  link=$(expr "$ls" : '.*-> \(.*\)$')
-  if expr "$link" : '/.*' >/dev/null; then
-    PRG="$link"
-  else
-    PRG=$(dirname "$PRG")"/$link"
-  fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="$(pwd)"
-cd "$(dirname \"$PRG\")/" >/dev/null
-APP_HOME="$(pwd -P)"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=$(basename "$0")
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn() {
-  echo "$*"
-}
+warn () {
+    echo "$*"
+} >&2
 
-die() {
-  echo
-  echo "$*"
-  echo
-  exit 1
-}
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$(uname)" in
-CYGWIN*)
-  cygwin=true
-  ;;
-Darwin*)
-  darwin=true
-  ;;
-MINGW*)
-  msys=true
-  ;;
-NONSTOP*)
-  nonstop=true
-  ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ]; then
-  if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-    # IBM's JDK on AIX uses strange locations for the executables
-    JAVACMD="$JAVA_HOME/jre/sh/java"
-  else
-    JAVACMD="$JAVA_HOME/bin/java"
-  fi
-  if [ ! -x "$JAVACMD" ]; then
-    die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-  fi
+    fi
 else
-  JAVACMD="java"
-  which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
-  MAX_FD_LIMIT=$(ulimit -H -n)
-  if [ $? -eq 0 ]; then
-    if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
-      MAX_FD="$MAX_FD_LIMIT"
-    fi
-    ulimit -n $MAX_FD
-    if [ $? -ne 0 ]; then
-      warn "Could not set maximum file descriptor limit: $MAX_FD"
     fi
-  else
-    warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-  fi
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  APP_HOME=$(cygpath --path --mixed "$APP_HOME")
-  CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
-  JAVACMD=$(cygpath --unix "$JAVACMD")
-
-  # We build the pattern for arguments to be converted via cygpath
-  ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
-  SEP=""
-  for dir in $ROOTDIRSRAW; do
-    ROOTDIRS="$ROOTDIRS$SEP$dir"
-    SEP="|"
-  done
-  OURCYGPATTERN="(^($ROOTDIRS))"
-  # Add a user-defined pattern to the cygpath arguments
-  if [ "$GRADLE_CYGPATTERN" != "" ]; then
-    OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-  fi
-  # Now convert the arguments - kludge to limit ourselves to /bin/sh
-  i=0
-  for arg in "$@"; do
-    CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
-    CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option
-
-    if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
-      eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
-    else
-      eval $(echo args$i)="\"$arg\""
-    fi
-    i=$((i + 1))
-  done
-  case $i in
-  0) set -- ;;
-  1) set -- "$args0" ;;
-  2) set -- "$args0" "$args1" ;;
-  3) set -- "$args0" "$args1" "$args2" ;;
-  4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-  5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-  6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-  7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-  8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-  9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-  esac
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
-# Escape application args
-save() {
-  for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
-  echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f9553162..9d21a218 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 7cbf6a9759746a9e95f0f447f35e8f5c111d9d20 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 11 Jan 2025 10:38:46 +0100
Subject: [PATCH 056/126] chore: update compileSdk; update config of
 buildConfig feature

---
 app/build.gradle.kts | 3 ++-
 gradle.properties    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 239f0c03..61eb1342 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -28,6 +28,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
diff --git a/gradle.properties b/gradle.properties
index af731300..9dd4781a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,5 @@ android.useAndroidX=true
 #android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false

From 464950e640c82df84088e44bf1e6a757bb863f61 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 11 Jan 2025 11:30:40 +0100
Subject: [PATCH 057/126] chore: updated dependencies; hopefully fix build

---
 .idea/androidTestResultsUserPreferences.xml | 119 ++++++++++++++++++++
 .idea/deploymentTargetDropDown.xml          |  29 +++--
 .idea/misc.xml                              |   2 +-
 app/build.gradle.kts                        |   4 +-
 build.gradle                                |   2 +-
 gradle/wrapper/gradle-wrapper.jar           | Bin 54329 -> 43504 bytes
 settings.gradle                             |   2 +-
 7 files changed, 141 insertions(+), 17 deletions(-)

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index c14ef4bb..87ee7a8a 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -3,6 +3,99 @@
   <component name="AndroidTestResultsUserPreferences">
     <option name="androidTestResultsTableState">
       <map>
+        <entry key="-1583583505">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-879618878">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-289023165">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Google Pixel 4 XL" value="120" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-195463670">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="28629151">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Google Pixel 4 XL" value="120" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="235798027">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="277173091">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="531090552">
           <value>
             <AndroidTestResultsTableState>
@@ -19,6 +112,32 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="1694491838">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="1811401743">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_rooted_Google_Pixel_2_API_29" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 4d459790..0ff848d8 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-09-11T10:57:06.838905Z" />
+    <value>
+      <entry key="All Tests">
+        <State />
+      </entry>
+      <entry key="ArduinoHelperAndroidTest">
+        <State />
+      </entry>
+      <entry key="app">
+        <State />
+      </entry>
+      <entry key="testAskForConnectionPermissionCallsCorrectMethods()">
+        <State />
+      </entry>
+      <entry key="testSetCustomBaudRateUseCaseAndroidTestCallsSetBaudRateOnRepository()">
+        <State />
+      </entry>
+    </value>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1fd0812a..1f7c50cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,7 @@
     </configurations>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 61eb1342..db97d491 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,7 +38,7 @@ android {
     compileSdk = 34
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
-        minSdk = 23
+        minSdk = 24
         targetSdk = 33
         versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 14
         versionName = "0.9.84${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
@@ -274,5 +274,5 @@ dependencies {
      * This library helps to automate some parts of the USB serial connection.
      * For more information, visit: https://github.com/felHR85/UsbSerial
      */
-    implementation("com.github.felHR85:UsbSerial:6.1.0")
+    implementation("com.github.superus8r:UsbSerial:6.1.1")
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8cc5ee89..b50464e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version '8.2.0' apply false
+    id("com.android.application") version '8.7.2' apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("org.sonarqube") version "3.5.0.2730"
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961fd5a86aa5fbfe90f707c3138408be7c718..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
literal 43504
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
TZiJi*F`$tkW<p)b$p8Kiq>Ln)

literal 54329
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
F{|7XC?P&l2

diff --git a/settings.gradle b/settings.gradle
index 19a3c784..c2c1085e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://jitpack.io" }
+        maven { url = uri("https://www.jitpack.io" ) }
     }
 }
 rootProject.name='USBTerminal'

From 9698a5ec9637fa40471452e0779bffc26cf59ff5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 11 Jan 2025 11:35:45 +0100
Subject: [PATCH 058/126] ci: update github actions upload-artifact@v1 to v4

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 91d44da3..05847941 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -42,7 +42,7 @@ jobs:
     - name: run unit tests
       run: bundle exec fastlane android run_unit_tests
     - name: Unit tests results
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: unit-test-results
         path: app/build/reports/tests/testDebugUnitTest/index.html
@@ -65,7 +65,7 @@ jobs:
       - name: Lint
         run: bash ./gradlew lintDebug
       - name: Lint results
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/reports/lint-results-debug.html

From efbf4a98e625ee83fa4278e09d000b0e209fe177 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 11 Jan 2025 14:59:12 +0100
Subject: [PATCH 059/126] ci: use kvm and linux runner instead of macos runner
 for running the ui tests

---
 .github/workflows/android.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 05847941..addaa0b0 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -71,7 +71,7 @@ jobs:
           path: app/build/reports/lint-results-debug.html
 
   ui-test:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -86,6 +86,11 @@ jobs:
         run: ./gradlew generateGoogleServicesJson
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

From 5f0bc686b8b679ccf061831b001f3cc8c568c77b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 11 Jan 2025 15:01:31 +0100
Subject: [PATCH 060/126] ci: update action setup-java@v1 to v4

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index addaa0b0..374b9ac1 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,7 +13,7 @@ jobs:
         ruby-version: '3.0'
         bundler-cache: true
     - name: set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '17'
@@ -76,7 +76,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
       - name: set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

From 554e9eb7b0243ea3e5ae6a75989f7ca48db480bb Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 13:21:58 +0200
Subject: [PATCH 061/126] chore: update compileSdk version

---
 .idea/misc.xml       | 1 -
 app/build.gradle.kts | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1f7c50cc..49bf8ca1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeSettings">
     <configurations>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index db97d491..f8fff76e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,6 @@ repositories {
 }
 
 android {
-    compileSdk = 34
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -35,7 +34,7 @@ android {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
 
-    compileSdk = 34
+    compileSdk = 35
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 24

From b4e2d4e8b129545ded6bf3808a4fa6ea2deb0f48 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 13:41:12 +0200
Subject: [PATCH 062/126] chore: update targetSdk to 35

---
 .github/workflows/android.yml | 80 +++++++++++++++++------------------
 app/build.gradle.kts          |  9 ++--
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 374b9ac1..8d9239a6 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,51 +1,51 @@
 name: Android CI
 
-on: [push]
+on: [ push ]
 
 jobs:
 
   unit-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
-        bundler-cache: true
-    - name: set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'zulu'
-        java-version: '17'
-    - name: Cache Gradle wrapper
-      uses: actions/cache@v3
-      with:
-        path: ~/.gradle/wrapper
-        key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-        restore-keys: |
-          ${{ runner.OS }}-gradle-wrapper-cache-
-    - name: Cache Gradle caches
-      uses: actions/cache@v3
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle') }}
-        restore-keys: |
-          ${{ runner.OS }}-gradle-caches-cache-
-    - name: generate ksProp file
-      run: ./gradlew generateKsPropFile
-    - name: generate google-services.json file
-      run: ./gradlew generateGoogleServicesJson
-      env:
-        GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
-    - name: setup fastlane
-      run: bundle install
-    - name: run unit tests
-      run: bundle exec fastlane android run_unit_tests
-    - name: Unit tests results
-      uses: actions/upload-artifact@v4
-      with:
-        name: unit-test-results
-        path: app/build/reports/tests/testDebugUnitTest/index.html
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.OS }}-gradle-wrapper-cache-
+      - name: Cache Gradle caches
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle') }}
+          restore-keys: |
+            ${{ runner.OS }}-gradle-caches-cache-
+      - name: generate ksProp file
+        run: ./gradlew generateKsPropFile
+      - name: generate google-services.json file
+        run: ./gradlew generateGoogleServicesJson
+        env:
+          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+      - name: setup fastlane
+        run: bundle install
+      - name: run unit tests
+        run: bundle exec fastlane android run_unit_tests
+      - name: Unit tests results
+        uses: actions/upload-artifact@v4
+        with:
+          name: unit-test-results
+          path: app/build/reports/tests/testDebugUnitTest/index.html
 
   lint:
     runs-on: ubuntu-latest
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f8fff76e..9e24e439 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,7 +38,7 @@ android {
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 35
         versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 14
         versionName = "0.9.84${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -269,9 +269,8 @@ dependencies {
     androidTestImplementation("androidx.test:runner:1.5.2")
     androidTestImplementation("androidx.test:rules:1.5.0")
 
-    /**
-     * This library helps to automate some parts of the USB serial connection.
-     * For more information, visit: https://github.com/felHR85/UsbSerial
-     */
+    // 3rd party
+
+    // Android Serial Controller
     implementation("com.github.superus8r:UsbSerial:6.1.1")
 }
\ No newline at end of file

From f1b8a6896ec2ac39aa14b2cb4012e53a12731995 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 13:51:28 +0200
Subject: [PATCH 063/126] chore: update fastlane

---
 Gemfile.lock | 59 ++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 947a2ae1..d5b4e4ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,21 +9,23 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1029.0)
-    aws-sdk-core (3.214.1)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1095.0)
+    aws-sdk-core (3.222.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+      logger
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.176.1)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.184.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -33,7 +35,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
@@ -67,7 +69,7 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
+    fastimage (2.4.0)
     fastlane (2.218.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
@@ -112,9 +114,9 @@ GEM
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.75.0)
+    google-apis-androidpublisher_v3 (0.78.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.15.1)
+    google-apis-core (0.17.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)
@@ -126,29 +128,30 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-firebaseappdistribution_v1alpha (0.2.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iamcredentials_v1 (0.22.0)
+    google-apis-iamcredentials_v1 (0.23.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-playcustomapp_v1 (0.16.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.49.0)
+    google-apis-storage_v1 (0.50.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.2.1)
+    google-cloud-env (2.3.0)
+      base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.54.0)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.56.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-core (~> 0.13)
       google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.38)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    google-logging-utils (0.1.0)
-    googleauth (1.12.2)
+    google-logging-utils (0.2.0)
+    googleauth (1.14.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
@@ -159,11 +162,13 @@ GEM
     highline (2.0.3)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     jmespath (1.6.2)
-    json (2.9.1)
+    json (2.11.3)
     jwt (2.10.1)
       base64
+    logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
@@ -175,19 +180,19 @@ GEM
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.0)
+    rexml (3.4.1)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     security (0.1.3)
-    signet (0.19.0)
+    signet (0.20.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)

From c2cf3419d308f5157e71aa2c59551e2b47853eb5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 14:05:25 +0200
Subject: [PATCH 064/126] chore: clean Fastfile; use an array of gradle tasks

---
 fastlane/Fastfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 445e4f80..620c3601 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -24,7 +24,13 @@ platform :android do
 
   desc "Runs all the tests with coverage"
   lane :testDev do
-    gradle(task: "generateKsPropFile generateGoogleServicesJson pixel2api30DebugAndroidTest testDebugUnitTest jacocoTestReport --stacktrace")
+    gradle(tasks: [
+        "generateKsPropFile",
+        "generateGoogleServicesJson",
+        "pixel2api30DebugAndroidTest",
+        "testDebugUnitTest",
+        "jacocoTestReport --stacktrace"
+    ])
   end
 
   desc "Deploy to Firebase AppTester Dev channel"

From 9a1566537fdc6c88aaf285b574936f79384044f5 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 14:13:36 +0200
Subject: [PATCH 065/126] chore: generateKsFile before generating the props for
 it

---
 fastlane/Fastfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 620c3601..b92226f6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -25,6 +25,7 @@ platform :android do
   desc "Runs all the tests with coverage"
   lane :testDev do
     gradle(tasks: [
+        "generateKsFile",
         "generateKsPropFile",
         "generateGoogleServicesJson",
         "pixel2api30DebugAndroidTest",

From 5f2bda7f0046633e60435d3d5626bfee44d96558 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 14:33:17 +0200
Subject: [PATCH 066/126] chore: remove unnecessary generateKsFile task

---
 fastlane/Fastfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b92226f6..620c3601 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -25,7 +25,6 @@ platform :android do
   desc "Runs all the tests with coverage"
   lane :testDev do
     gradle(tasks: [
-        "generateKsFile",
         "generateKsPropFile",
         "generateGoogleServicesJson",
         "pixel2api30DebugAndroidTest",

From d3a8b4b9377b6e68c01c674910ba65f0f54d335e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 14:33:56 +0200
Subject: [PATCH 067/126] chore: explicitly set whether the broadcast receiver
 is exported or not

---
 .../kabiri/android/usbterminal/arduino/ArduinoHelper.kt    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 1d1e4d82..6381fc0a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -8,6 +8,7 @@ import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
 import android.util.Log
+import androidx.core.content.ContextCompat
 import com.felhr.usbserial.UsbSerialDevice
 import com.felhr.usbserial.UsbSerialInterface
 import kotlinx.coroutines.CoroutineScope
@@ -119,10 +120,12 @@ internal class ArduinoHelper
             0,
             Intent(Constants.ACTION_USB_PERMISSION),
             // it is necessary for connecting to the device.
-            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
         val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
-        context.registerReceiver(arduinoPermReceiver, filter) // register the broadcast receiver
+        // register the broadcast receiver
+        ContextCompat.registerReceiver(context, arduinoPermReceiver, filter,
+            ContextCompat.RECEIVER_NOT_EXPORTED)
         usbManager.requestPermission(device.value, permissionIntent)
         _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
     }

From 93910a756bbf85fa4e77e75a7b0cde50619d281b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 14:46:48 +0200
Subject: [PATCH 068/126] ui: avoid system navbar or soft keyboard overlapping
 content

---
 .../org/kabiri/android/usbterminal/MainActivity.kt   | 12 ++++++++++++
 app/src/main/res/layout/activity_main.xml            |  1 +
 2 files changed, 13 insertions(+)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 46bb11b6..227bee3b 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -8,12 +8,15 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
@@ -35,6 +38,15 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        // avoid system navbar or soft keyboard overlapping the content.
+        val rootView = findViewById<View>(R.id.root_view)
+        ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+            view.setPadding(0, 0, 0, maxOf(systemBarsInsets.bottom, imeInsets.bottom))
+            insets
+        }
+
         val etInput = findViewById<EditText>(R.id.etInput)
         val tvOutput = findViewById<TextView>(R.id.tvOutput)
         val btEnter = findViewById<Button>(R.id.btEnter)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 99b82e4c..0c64f181 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,6 +3,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">

From fc38762b5c80d8a9903573f7077219fd0f9ef56b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 15:17:16 +0200
Subject: [PATCH 069/126] refactor: update deprecated getParcelableExtra usage

---
 .../arduino/ArduinoPermissionBroadcastReceiver.kt         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index d70301ee..b3407f75 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
+import android.os.Build
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -43,7 +44,12 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
         when (intent?.action) {
             Constants.ACTION_USB_PERMISSION -> {
 
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+                val device: UsbDevice? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
+                } else {
+                    @Suppress("DEPRECATION")
+                    intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+                }
                 val permissionGranted = intent
                     .getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
 

From 4e8f231e81c24ca57314f3f595eb15918eaa22bb Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:05:32 +0200
Subject: [PATCH 070/126] refactor: update action name

---
 app/src/main/java/org/kabiri/android/usbterminal/Constants.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt b/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
index b4357479..5e760c7a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
@@ -5,6 +5,6 @@ package org.kabiri.android.usbterminal
  */
 class Constants {
     companion object {
-        const val ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION"
+        const val ACTION_USB_PERMISSION = "org.kabiri.android.usbterminal.ACTION_USB_PERMISSION"
     }
 }
\ No newline at end of file

From 6aeb3d655fe868a099abe882b68f075a9bad7e10 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:05:45 +0200
Subject: [PATCH 071/126] refactor: improve debug logs

---
 .../usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index b3407f75..5e68ded5 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -56,10 +56,10 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
                 if (permissionGranted) {
                     _liveInfoOutput.value =
                         "${context?.getString(R.string.breceiver_info_usb_permission_granted)} ${device?.manufacturerName}"
-                    Log.i(TAG, "USB permission granted by the user")
+                    Log.i(TAG, "USB permission granted by the user - device:\n$device")
                     device?.let { _liveGrantedDevice.postValue(it) }
                 } else {
-                    Log.e(TAG, "USB permission was probably denied by the user")
+                    Log.e(TAG, "USB permission was probably denied by the user, intent:\n$intent\ndevice:\n$device")
                     _liveErrorOutput.value =
                         "${context?.getString(R.string.breceiver_error_usb_permission_denied)} ${device?.manufacturerName}"
                 }

From 329829702202de522203b86f777a4b3073fa500a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:06:11 +0200
Subject: [PATCH 072/126] refactor: register broadcast receiver before
 requesting permission

---
 .../android/usbterminal/arduino/ArduinoHelper.kt   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 6381fc0a..3aa9a69e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -115,17 +115,21 @@ internal class ArduinoHelper
     }
 
     private fun connect(device: MutableMap.MutableEntry<String, UsbDevice>) {
+        // register the broadcast receiver before requesting permission
+        ContextCompat.registerReceiver(
+            context,
+            arduinoPermReceiver,
+            IntentFilter(Constants.ACTION_USB_PERMISSION),
+            ContextCompat.RECEIVER_EXPORTED
+        )
+
+        // request permission to access the usb device
         val permissionIntent = PendingIntent.getBroadcast(
             context,
             0,
             Intent(Constants.ACTION_USB_PERMISSION),
-            // it is necessary for connecting to the device.
             PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
-        val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
-        // register the broadcast receiver
-        ContextCompat.registerReceiver(context, arduinoPermReceiver, filter,
-            ContextCompat.RECEIVER_NOT_EXPORTED)
         usbManager.requestPermission(device.value, permissionIntent)
         _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
     }

From 6d778dcd1da108a362bfa25cda2ebf9879350840 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:06:22 +0200
Subject: [PATCH 073/126] refactor: register the receiver in manifest

---
 app/src/main/AndroidManifest.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b32c7645..9c96f699 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,16 @@
                 android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
                 android:resource="@xml/accessory_filter" />
         </activity>
+
+        <receiver
+            android:name="org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver"
+            android:exported="true"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="org.kabiri.android.usbterminal.ACTION_USB_PERMISSION"/>
+            </intent-filter>
+        </receiver>
+
     </application>
 
 </manifest>
\ No newline at end of file

From dc9a08604c1cdfaf7dc1237a34d03fd4d916c64c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:31:17 +0200
Subject: [PATCH 074/126] deps: update dependencies

---
 app/build.gradle.kts | 32 ++++++++++++++++----------------
 build.gradle         |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9e24e439..60ef4b85 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -208,9 +208,9 @@ val coroutines_version: String by project
 val material_version: String by project
 dependencies {
 
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
 
     // Firebase
     implementation(platform("com.google.firebase:firebase-bom:$firebase_bom_version"))
@@ -222,11 +222,11 @@ dependencies {
     kapt("com.google.dagger:hilt-compiler:$hilt_version")
 
     // Coroutines
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
 
     // Compose Bom
     val composeBom = platform("androidx.compose:compose-bom:2023.06.01")
@@ -237,14 +237,14 @@ dependencies {
     // Compose - Android Studio Preview support
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
-    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.activity:activity-compose:1.10.1")
 
     // Other UI Libraries
     implementation("com.google.android.material:material:$material_version")
 
 
     // data
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
+    implementation("androidx.datastore:datastore-preferences:1.1.4")
 
     // hilt testing
     // more info:
@@ -257,17 +257,17 @@ dependencies {
     testImplementation("com.google.truth:truth:1.1.3")
 
     // instrumented test libs
-    androidTestImplementation("androidx.test:core:1.5.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.ext:junit-ktx:1.1.5")
-    androidTestImplementation("androidx.test.ext:truth:1.5.0")
+    androidTestImplementation("androidx.test:core:1.6.1")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
+    androidTestImplementation("androidx.test.ext:truth:1.6.0")
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
     // Espresso
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     // Hamcrest for view matching
     androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
-    androidTestImplementation("androidx.test:runner:1.5.2")
-    androidTestImplementation("androidx.test:rules:1.5.0")
+    androidTestImplementation("androidx.test:runner:1.6.2")
+    androidTestImplementation("androidx.test:rules:1.6.1")
 
     // 3rd party
 
diff --git a/build.gradle b/build.gradle
index b50464e9..5c5f2c31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         hilt_version = "2.44"
         jacoco_version = "0.8.8"
         kotlin_version = "1.8.10"
-        material_version = "1.11.0"
+        material_version = "1.12.0"
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

From fff4ad5cfc480244a1324693ff4b8694d38747bd Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:49:54 +0200
Subject: [PATCH 075/126] deps: update kotlin and hilt

---
 app/build.gradle.kts | 5 +----
 build.gradle         | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 60ef4b85..2f6db4f7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("kotlin-kapt")
     id("dagger.hilt.android.plugin")
     id("jacoco")
@@ -30,10 +31,6 @@ android {
         buildConfig = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.4"
-    }
-
     compileSdk = 35
     defaultConfig {
         applicationId = "org.kabiri.android.usbterminal"
diff --git a/build.gradle b/build.gradle
index 5c5f2c31..f6f52206 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ buildscript {
     ext {
         coroutines_version = "1.6.4"
         firebase_bom_version = "32.8.0"
-        hilt_version = "2.44"
+        hilt_version = "2.56.2"
         jacoco_version = "0.8.8"
-        kotlin_version = "1.8.10"
+        kotlin_version = "2.1.20"
         material_version = "1.12.0"
     }
     dependencies {
@@ -16,7 +16,8 @@ buildscript {
 
 plugins {
     id("com.android.application") version '8.7.2' apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.20"
     id("org.sonarqube") version "3.5.0.2730"
 }
 

From 709e2a427ff96beb98ed53c9e29f872c674599f2 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:58:50 +0200
Subject: [PATCH 076/126] nitpick: format; no changes

---
 .../usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index 5e68ded5..5d2dc379 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -43,7 +43,6 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         when (intent?.action) {
             Constants.ACTION_USB_PERMISSION -> {
-
                 val device: UsbDevice? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
                 } else {
@@ -64,8 +63,10 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
                         "${context?.getString(R.string.breceiver_error_usb_permission_denied)} ${device?.manufacturerName}"
                 }
             }
+
             UsbManager.ACTION_USB_DEVICE_ATTACHED -> _liveOutput.value =
                 context?.getString(R.string.breceiver_info_device_attached) ?: ""
+
             UsbManager.ACTION_USB_DEVICE_DETACHED -> _liveOutput.value =
                 context?.getString(R.string.breceiver_info_device_detached) ?: ""
         }

From 9e212764b8b1419e8e810b0a5f026e8d9d8510c9 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Thu, 1 May 2025 16:59:14 +0200
Subject: [PATCH 077/126] nitpick: format; no changes

---
 .../usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index 5d2dc379..242c0ec3 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -51,7 +51,6 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
                 }
                 val permissionGranted = intent
                     .getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
-
                 if (permissionGranted) {
                     _liveInfoOutput.value =
                         "${context?.getString(R.string.breceiver_info_usb_permission_granted)} ${device?.manufacturerName}"

From 29682e36e9a819881ee60ae282ade06982a41096 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 08:48:24 +0200
Subject: [PATCH 078/126] chore: add .aiexclude file

---
 .aiexclude | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 .aiexclude

diff --git a/.aiexclude b/.aiexclude
new file mode 100644
index 00000000..844da302
--- /dev/null
+++ b/.aiexclude
@@ -0,0 +1,89 @@
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/*
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+app/src/main/res/values/api_keys.xml
+.idea/compiler.xml
+.idea/compiler.xml
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/misc.xml
+app/build.gradle
+.idea/misc.xml
+.idea/misc.xml
+.idea/misc.xml
+.idea/misc.xml
+.idea/misc.xml
+.idea/.name
+.idea/codeStyles/Project.xml
+.idea/misc.xml
+.idea/misc.xml

From 9d8adbc645bdeda78fd22dc2aba43ac16ea552f3 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 08:48:47 +0200
Subject: [PATCH 079/126] bugfix: fixed the issue with arduino clones not being
 able to connect

---
 app/src/main/AndroidManifest.xml              | 20 +----
 .../kabiri/android/usbterminal/Constants.kt   |  2 +-
 .../android/usbterminal/MainActivity.kt       |  7 +-
 .../usbterminal/arduino/ArduinoHelper.kt      | 84 +++++++++----------
 .../ArduinoPermissionBroadcastReceiver.kt     | 51 +++++++----
 .../data/repository/UsbPermissionReceiver.kt  | 18 ++++
 .../data/repository/UsbRepository.kt          | 74 ++++++++++++++++
 .../android/usbterminal/di/AppModule.kt       | 31 ++++++-
 .../usbterminal/domain/ArduinoUseCase.kt      | 39 +++++++++
 .../android/usbterminal/domain/UsbUseCase.kt  | 27 ++++++
 .../extensions/UsbDeviceExtensions.kt         | 27 ++++++
 .../usbterminal/model/ArduinoDevice.kt        | 18 ++++
 .../viewmodel/MainActivityViewModel.kt        | 63 +++++++++++---
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml/accessory_filter.xml     |  4 -
 15 files changed, 363 insertions(+), 104 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
 delete mode 100644 app/src/main/res/xml/accessory_filter.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c96f699..07074fa9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
         <!-- sentry: replace the empty value with @string/sentry_dsn -->
         <meta-data android:name="io.sentry.dsn" android:value="" />
 
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
@@ -30,24 +31,7 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
-                android:resource="@xml/accessory_filter" />
         </activity>
-
-        <receiver
-            android:name="org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver"
-            android:exported="true"
-            tools:ignore="ExportedReceiver">
-            <intent-filter>
-                <action android:name="org.kabiri.android.usbterminal.ACTION_USB_PERMISSION"/>
-            </intent-filter>
-        </receiver>
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt b/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
index 5e760c7a..a9d918de 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/Constants.kt
@@ -5,6 +5,6 @@ package org.kabiri.android.usbterminal
  */
 class Constants {
     companion object {
-        const val ACTION_USB_PERMISSION = "org.kabiri.android.usbterminal.ACTION_USB_PERMISSION"
+        const val ACTION_USB_PERMISSION = "org.kabiri.android.usbterminal.USB_PERMISSION"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 227bee3b..dc0ae18c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -54,11 +54,6 @@ class MainActivity : AppCompatActivity() {
         // make the text view scrollable:
         tvOutput.movementMethod = ScrollingMovementMethod()
 
-        // open the device and port when the permission is granted by user.
-        viewModel.getGrantedDevice().observe(this) { device ->
-            viewModel.openDeviceAndPort(device)
-        }
-
         lifecycleScope.launchWhenResumed {
             viewModel.getLiveOutput().collect {
                 val spannable = SpannableString(it.text)
@@ -106,7 +101,7 @@ class MainActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.actionConnect -> {
-                viewModel.askForConnectionPermission()
+                viewModel.connect()
                 true
             }
             R.id.actionDisconnect -> {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 3aa9a69e..3566af2c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
 
@@ -73,29 +74,26 @@ internal class ArduinoHelper
     /**
      * register the Arduino Permission Broadcast Receiver.
      */
-    fun askForConnectionPermission() {
-        val usbDevices = usbManager.deviceList
-        _liveInfoOutput.value =
-            context.getString(R.string.helper_info_checking_attached_usb_devices)
-        if (usbDevices.isNotEmpty()) {
-            for (device in usbDevices) {
-                val deviceVID = device.value.vendorId
-                if (deviceVID == 0x2341) { // Arduino vendor ID
-                    connect(device)
-                } else {
-                    _liveErrorOutput.value =
-                        context.getString(R.string.helper_error_device_not_found)
-                    _liveErrorOutput.value =
-                        context.getString(R.string.helper_error_connecting_anyway)
-                    connect(device)
-                }
-            }
-        } else {
-            _liveErrorOutput.value = ""
-            _liveErrorOutput.value =
-                context.getString(R.string.helper_error_usb_devices_not_attached)
-        }
-    }
+//    fun askForConnectionPermission() {
+//        val usbDevices = usbManager.deviceList
+//        _liveInfoOutput.value =
+//            context.getString(R.string.helper_info_checking_attached_usb_devices)
+//        if (usbDevices.isNotEmpty()) {
+//            for (device in usbDevices) {
+//                if (!device.value.isOfficialArduinoBoard()) {
+//                    _liveErrorOutput.value =
+//                        context.getString(R.string.helper_error_device_not_found)
+//                    _liveErrorOutput.value =
+//                        context.getString(R.string.helper_error_connecting_anyway)
+//                }
+//                connect(device)
+//            }
+//        } else {
+//            _liveErrorOutput.value = ""
+//            _liveErrorOutput.value =
+//                context.getString(R.string.helper_error_usb_devices_not_attached)
+//        }
+//    }
 
     fun disconnect() {
         try {
@@ -114,25 +112,27 @@ internal class ArduinoHelper
         }
     }
 
-    private fun connect(device: MutableMap.MutableEntry<String, UsbDevice>) {
-        // register the broadcast receiver before requesting permission
-        ContextCompat.registerReceiver(
-            context,
-            arduinoPermReceiver,
-            IntentFilter(Constants.ACTION_USB_PERMISSION),
-            ContextCompat.RECEIVER_EXPORTED
-        )
-
-        // request permission to access the usb device
-        val permissionIntent = PendingIntent.getBroadcast(
-            context,
-            0,
-            Intent(Constants.ACTION_USB_PERMISSION),
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
-        usbManager.requestPermission(device.value, permissionIntent)
-        _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
-    }
+//    private fun connect(device: MutableMap.MutableEntry<String, UsbDevice>) {
+//        val permissionIntent = PendingIntent.getBroadcast(
+//            context,
+//            0,
+//            Intent(Constants.ACTION_USB_PERMISSION),
+//            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+//        )
+//
+//        ContextCompat.registerReceiver(
+//            context,
+//            arduinoPermReceiver,
+//            IntentFilter(Constants.ACTION_USB_PERMISSION),
+//            ContextCompat.RECEIVER_EXPORTED
+//        )
+//
+//        Log.i(TAG, "receiver:\n$arduinoPermReceiver")
+//        Log.i(TAG, "usb device before request permission:\n${device.value}")
+//        usbManager.requestPermission(device.value, permissionIntent)
+//
+//        _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
+//    }
 
     /**
      * use this live object in activity
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
index 242c0ec3..bc5f13a0 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
@@ -5,14 +5,18 @@ import android.content.Context
 import android.content.Intent
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
+import android.hardware.usb.UsbManager.EXTRA_DEVICE
+import android.hardware.usb.UsbManager.EXTRA_PERMISSION_GRANTED
 import android.os.Build
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
+import kotlin.collections.plusAssign
 
 /**
  * Created by Ali Kabiri on 13.04.20.
@@ -36,38 +40,49 @@ class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
     val liveErrorOutput: StateFlow<String>
         get() = _liveErrorOutput
 
-    private val _liveGrantedDevice = MutableLiveData<UsbDevice>()
-    val liveGrantedDevice: LiveData<UsbDevice> // prevent mutable object to be public.
+    private val _liveGrantedDevice = MutableStateFlow<UsbDevice?>(null)
+    val liveGrantedDevice: StateFlow<UsbDevice?>
         get() = _liveGrantedDevice
 
     override fun onReceive(context: Context?, intent: Intent?) {
         when (intent?.action) {
             Constants.ACTION_USB_PERMISSION -> {
-                val device: UsbDevice? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
-                } else {
-                    @Suppress("DEPRECATION")
-                    intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-                }
-                val permissionGranted = intent
-                    .getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
+                Log.i(TAG, "receiver: USB permission intent received $this")
+                val extras = intent.extras
+                _liveInfoOutput.value += "\nIntent extras: $extras"
+
+                val device: UsbDevice? = intent.getParcelableExtra(EXTRA_DEVICE)
+                val permissionGranted = intent.getBooleanExtra(EXTRA_PERMISSION_GRANTED, false)
                 if (permissionGranted) {
-                    _liveInfoOutput.value =
-                        "${context?.getString(R.string.breceiver_info_usb_permission_granted)} ${device?.manufacturerName}"
-                    Log.i(TAG, "USB permission granted by the user - device:\n$device")
-                    device?.let { _liveGrantedDevice.postValue(it) }
+                    val info = "${context?.getString(R.string.breceiver_info_usb_permission_granted)} " +
+                            "${device?.manufacturerName} ${device?.productName} " +
+                            "${device?.vendorId} ${device?.productId}"
+                    _liveInfoOutput.value += "\n$info"
+                    device?.let {
+                        _liveInfoOutput.value = "setting the device globally..."
+                        _liveGrantedDevice.value = it
+                    }
                 } else {
-                    Log.e(TAG, "USB permission was probably denied by the user, intent:\n$intent\ndevice:\n$device")
+                    val err = "${context?.getString(R.string.breceiver_error_usb_permission_denied)} " +
+                            "${device?.manufacturerName} ${device?.productName} " +
+                            "${device?.vendorId} ${device?.productId}"
                     _liveErrorOutput.value =
-                        "${context?.getString(R.string.breceiver_error_usb_permission_denied)} ${device?.manufacturerName}"
+                        "${context?.getString(R.string.breceiver_error_usb_permission_denied)} $err"
                 }
             }
 
-            UsbManager.ACTION_USB_DEVICE_ATTACHED -> _liveOutput.value =
-                context?.getString(R.string.breceiver_info_device_attached) ?: ""
+            UsbManager.ACTION_USB_DEVICE_ATTACHED -> {
+                val attachedMsg = context?.getString(R.string.breceiver_info_device_attached) ?: ""
+                _liveOutput.value = attachedMsg
+            }
 
             UsbManager.ACTION_USB_DEVICE_DETACHED -> _liveOutput.value =
                 context?.getString(R.string.breceiver_info_device_detached) ?: ""
+
+            null -> {
+                val nullMsg = "intent.action was null"
+                _liveErrorOutput.value = nullMsg
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
new file mode 100644
index 00000000..47e46264
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
@@ -0,0 +1,18 @@
+package org.kabiri.android.usbterminal.data.repository
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbManager
+import org.kabiri.android.usbterminal.Constants
+
+internal class UsbPermissionReceiver(private val repository: UsbRepository) : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if (intent?.action == Constants.ACTION_USB_PERMISSION) {
+            val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+            val granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
+            repository.onPermissionResult(device, granted)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
new file mode 100644
index 00000000..7121325c
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -0,0 +1,74 @@
+package org.kabiri.android.usbterminal.data.repository
+
+import android.content.Context
+import android.content.Intent
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbManager
+import android.app.PendingIntent
+import android.content.IntentFilter
+import androidx.core.content.ContextCompat
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.kabiri.android.usbterminal.Constants
+import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
+import org.kabiri.android.usbterminal.model.ArduinoDevice
+import javax.inject.Inject
+
+internal interface IUsbRepository {
+    val usbDevice: StateFlow<UsbDevice?>
+    fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit)
+    fun requestUsbPermission(device: UsbDevice)
+    fun onPermissionResult(device: UsbDevice?, granted: Boolean)
+    fun disconnect()
+}
+
+internal class UsbRepository
+@Inject constructor(
+    private val context: Context
+): IUsbRepository {
+    private val usbManager = context.getSystemService(UsbManager::class.java)
+
+    private val _usbDevice = MutableStateFlow<UsbDevice?>(null)
+    override val usbDevice: StateFlow<UsbDevice?> get() = _usbDevice
+
+    override fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit) {
+        val deviceList = usbManager.deviceList
+        val device = deviceList.values.firstOrNull { usbDevice ->
+            usbDevice.isOfficialArduinoBoard() || usbDevice.isCloneArduinoBoard()
+        }
+        if (device != null) {
+            return onResult(ArduinoDevice(device))
+        }
+        return onResult(null)
+    }
+
+    override fun requestUsbPermission(device: UsbDevice) {
+        val permissionIntent = PendingIntent.getBroadcast(
+            context,
+            0,
+            Intent(Constants.ACTION_USB_PERMISSION),
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+        _usbDevice.value = device
+        ContextCompat.registerReceiver(
+            context,
+            UsbPermissionReceiver(this),
+            IntentFilter(Constants.ACTION_USB_PERMISSION),
+            ContextCompat.RECEIVER_EXPORTED
+        )
+        usbManager.requestPermission(device, permissionIntent)
+    }
+
+    override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
+        if (granted && device != null) {
+            _usbDevice.value = device
+        } else {
+            _usbDevice.value = null
+        }
+    }
+
+    override fun disconnect() {
+        _usbDevice.value = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 8747444b..34236e59 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -14,13 +14,19 @@ import dagger.hilt.components.SingletonComponent
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
+import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import org.kabiri.android.usbterminal.data.repository.USER_SETTING_PREFERENCES_NAME
+import org.kabiri.android.usbterminal.data.repository.UsbRepository
 import org.kabiri.android.usbterminal.data.repository.UserSettingRepository
+import org.kabiri.android.usbterminal.domain.ArduinoUseCase
 import org.kabiri.android.usbterminal.domain.GetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.IArduinoUseCase
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.IUsbUseCase
 import org.kabiri.android.usbterminal.domain.SetCustomBaudRateUseCase
+import org.kabiri.android.usbterminal.domain.UsbUseCase
 import javax.inject.Singleton
 
 /**
@@ -71,14 +77,35 @@ internal class AppModule {
 
     @Provides
     fun provideUserSettingRepository(
-        dataStore: DataStore<Preferences>
+        dataStore: DataStore<Preferences>,
     ): IUserSettingRepository {
         return UserSettingRepository(dataStore)
     }
 
+    @Provides
+    fun provideUsbRepository(
+        context: Context,
+    ): IUsbRepository {
+        return UsbRepository(context = context)
+    }
+
+    @Provides
+    fun provideUsbUseCase(
+        usbRepository: IUsbRepository,
+    ): IUsbUseCase {
+        return UsbUseCase(usbRepository = usbRepository)
+    }
+
+    @Provides
+    fun provideArduinoUseCase(
+        arduinoHelper: ArduinoHelper,
+    ): IArduinoUseCase {
+        return ArduinoUseCase(arduinoHelper = arduinoHelper)
+    }
+
     @Provides
     fun provideGetCustomBaudRateUseCase(
-        userSettingRepository: IUserSettingRepository
+        userSettingRepository: IUserSettingRepository,
     ): IGetCustomBaudRateUseCase {
         return GetCustomBaudRateUseCase(userSettingRepository = userSettingRepository)
     }
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
new file mode 100644
index 00000000..0aef0c91
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
@@ -0,0 +1,39 @@
+package org.kabiri.android.usbterminal.domain
+
+import android.hardware.usb.UsbDevice
+import kotlinx.coroutines.flow.Flow
+import org.kabiri.android.usbterminal.arduino.ArduinoHelper
+import javax.inject.Inject
+
+internal interface IArduinoUseCase {
+    fun openDeviceAndPort(device: UsbDevice)
+    fun disconnect()
+    fun serialWrite(command: String): Boolean
+    val output: Flow<String>
+    val infoOutput: Flow<String>
+    val errorOutput: Flow<String>
+}
+
+internal class ArduinoUseCase
+@Inject constructor(
+    private val arduinoHelper: ArduinoHelper
+) : IArduinoUseCase {
+    override fun openDeviceAndPort(device: UsbDevice) {
+        // Delegate the connection logic to the helper
+        arduinoHelper.openDeviceAndPort(device)
+    }
+
+    override fun disconnect() {
+        arduinoHelper.disconnect()
+    }
+
+    override fun serialWrite(command: String): Boolean {
+        return arduinoHelper.serialWrite(command)
+    }
+
+    override val output get() = arduinoHelper.output
+
+    override val infoOutput get() = arduinoHelper.infoOutput
+
+    override val errorOutput get() = arduinoHelper.errorOutput
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
new file mode 100644
index 00000000..ff47d502
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -0,0 +1,27 @@
+package org.kabiri.android.usbterminal.domain
+
+import android.hardware.usb.UsbDevice
+import kotlinx.coroutines.flow.StateFlow
+import org.kabiri.android.usbterminal.data.repository.IUsbRepository
+import org.kabiri.android.usbterminal.model.ArduinoDevice
+import javax.inject.Inject
+
+internal interface IUsbUseCase {
+    val usbDevice: StateFlow<UsbDevice?>
+    fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit)
+    fun requestPermission(device: UsbDevice)
+    fun disconnect()
+}
+
+internal class UsbUseCase
+@Inject constructor(
+    private val usbRepository: IUsbRepository
+): IUsbUseCase {
+    override val usbDevice: StateFlow<UsbDevice?> get() = usbRepository.usbDevice
+
+    override fun scanForArduinoDevices(onResult: (ArduinoDevice?) -> Unit) = usbRepository.scanForArduinoDevices(onResult)
+
+    override fun requestPermission(device: UsbDevice) = usbRepository.requestUsbPermission(device)
+
+    override fun disconnect() = usbRepository.disconnect()
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt b/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
new file mode 100644
index 00000000..8abc4623
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
@@ -0,0 +1,27 @@
+package org.kabiri.android.usbterminal.extensions
+
+import android.hardware.usb.UsbDevice
+
+internal fun UsbDevice.isOfficialArduinoBoard(): Boolean {
+    val vendorId = this.vendorId
+    val productId = this.productId
+
+    // Check if the device is an official Arduino board
+    return when (vendorId) {
+        0x2341 -> productId in listOf(0x0043, 0x0044, 0x0243, 0x0244, 0x0245, 0x0246, 0x0247)
+        0x2A03 -> productId in listOf(0x0001, 0x0002, 0x0003)
+        else -> false
+    }
+}
+
+internal fun UsbDevice.isCloneArduinoBoard(): Boolean {
+    val vendorId = this.vendorId
+    val productId = this.productId
+
+    // Check if the device is a clone Arduino board
+    return when (vendorId) {
+        0x1A86 -> productId in listOf(0x7523, 0x7525)
+        0x0403 -> productId in listOf(0x6001, 0x6015)
+        else -> false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt b/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
new file mode 100644
index 00000000..36b05e5d
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
@@ -0,0 +1,18 @@
+package org.kabiri.android.usbterminal.model
+
+import android.hardware.usb.UsbDevice
+import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
+
+internal data class ArduinoDevice(
+    val device: UsbDevice,
+) {
+    val type: ArduinoType = when {
+        device.isOfficialArduinoBoard() -> ArduinoType.OFFICIAL
+        device.isCloneArduinoBoard() -> ArduinoType.CLONE
+        else -> ArduinoType.UNKNOWN
+    }
+    enum class ArduinoType {
+        OFFICIAL, CLONE, UNKNOWN,
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index d51c9009..c0d02293 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -1,9 +1,9 @@
 package org.kabiri.android.usbterminal.viewmodel
 
 import android.hardware.usb.UsbDevice
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.lifecycle.*
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -12,7 +12,10 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import org.kabiri.android.usbterminal.arduino.ArduinoHelper
+import org.kabiri.android.usbterminal.domain.IArduinoUseCase
+import org.kabiri.android.usbterminal.domain.IUsbUseCase
+import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.CLONE
+import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
 import org.kabiri.android.usbterminal.model.OutputText
 import javax.inject.Inject
 
@@ -22,24 +25,60 @@ import javax.inject.Inject
 @HiltViewModel
 internal class MainActivityViewModel
 @Inject constructor(
-    private val arduinoHelper: ArduinoHelper,
+    private val arduinoUseCase: IArduinoUseCase,
+    private val usbUseCase: IUsbUseCase
 ): ViewModel() {
 
+    init {
+        // Subscribe to USB device changes.
+        viewModelScope.launch {
+            usbUseCase.usbDevice.collect { device ->
+                device?.let { openDeviceAndPort(it) }
+            }
+        }
+    }
+
     private val _outputLive = MutableStateFlow("")
     val output: StateFlow<String>
         get() = _outputLive
     val output2 = SnapshotStateList<OutputText>()
 
-    fun askForConnectionPermission() = arduinoHelper.askForConnectionPermission()
+    fun connect() {
+        usbUseCase.scanForArduinoDevices { result ->
+            if (result == null) return@scanForArduinoDevices
+            when (result.type) {
+                OFFICIAL -> {
+//                    _liveErrorOutput.value =
+//                        context.getString(R.string.helper_error_device_not_found)
+//                    _liveErrorOutput.value =
+//                        context.getString(R.string.helper_error_connecting_anyway)
+                    usbUseCase.requestPermission(result.device)
+                }
+                CLONE -> {
+//                    _liveErrorOutput.value = ""
+//                    _liveErrorOutput.value =
+//                        context.getString(R.string.helper_error_usb_devices_not_attached)
+                    usbUseCase.requestPermission(result.device)
+                }
+                else -> {
+
+                }
+            }
+        }
+    }
+
+    fun disconnect() {
+        usbUseCase.disconnect()
+        arduinoUseCase.disconnect()
+    }
 
-    fun disconnect() = arduinoHelper.disconnect()
-    fun getGrantedDevice() = arduinoHelper.getGrantedDevice()
     fun openDeviceAndPort(device: UsbDevice) = viewModelScope.launch {
-        arduinoHelper.openDeviceAndPort(device)
+        arduinoUseCase.openDeviceAndPort(device)
     }
+
     fun serialWrite(command: String): Boolean {
         _outputLive.value = "${output.value}\n$command\n"
-        return arduinoHelper.serialWrite(command)
+        return arduinoUseCase.serialWrite(command)
     }
 
     /**
@@ -48,9 +87,9 @@ internal class MainActivityViewModel
      */
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
-        val serialOutput = arduinoHelper.output
-        val serialInfoOutput = arduinoHelper.infoOutput
-        val serialErrorOutput = arduinoHelper.errorOutput
+        val serialOutput = arduinoUseCase.output
+        val serialInfoOutput = arduinoUseCase.infoOutput
+        val serialErrorOutput = arduinoUseCase.errorOutput
 
         val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b57fa74..caf5ec97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,7 +51,7 @@
     <string name="helper_info_baud_rate_applying">Baud rate: %d (can be changed in settings)\n</string>
     <string name="helper_info_baud_rate_applied">Baud rate applied successfully: %d\n</string>
 
-    <string name="breceiver_info_usb_permission_granted">"Permission granted for: \n"</string>
+    <string name="breceiver_info_usb_permission_granted">"USB Permission granted for: \n"</string>
     <string name="breceiver_error_usb_permission_denied">permission denied for device:\n</string>
     <string name="breceiver_info_device_attached">Device attached\n</string>
     <string name="breceiver_info_device_detached">Device detached\n</string>
diff --git a/app/src/main/res/xml/accessory_filter.xml b/app/src/main/res/xml/accessory_filter.xml
deleted file mode 100644
index a9d1ce46..00000000
--- a/app/src/main/res/xml/accessory_filter.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <usb-accessory model="DemoKit" manufacturer="Google" version="1.0"/>
-</resources>
\ No newline at end of file

From 8be6cebc5692d1feb81a53183a3c33c46e5c8b9a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 10:02:20 +0200
Subject: [PATCH 080/126] refactor: remove unused methods, improve readability
 of ArduinoHelper

---
 .../usbterminal/arduino/ArduinoHelper.kt      | 113 +++++-------------
 .../usbterminal/domain/ArduinoUseCase.kt      |  17 +--
 .../viewmodel/MainActivityViewModel.kt        |   8 +-
 3 files changed, 42 insertions(+), 96 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 3566af2c..ec3ec314 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -1,14 +1,10 @@
 package org.kabiri.android.usbterminal.arduino
 
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
 import android.util.Log
-import androidx.core.content.ContextCompat
 import com.felhr.usbserial.UsbSerialDevice
 import com.felhr.usbserial.UsbSerialInterface
 import kotlinx.coroutines.CoroutineScope
@@ -17,10 +13,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
-import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
-import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
 
@@ -45,21 +39,21 @@ internal class ArduinoHelper
 
     private var currentBaudRate = defaultBaudRate // Default value
 
-    private val _liveOutput = MutableStateFlow("")
-    val output: Flow<String>
-        get() = _liveOutput
+    private val _messageFlow = MutableStateFlow("")
+    val messageFlow: Flow<String>
+        get() = _messageFlow
             .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
 
-    private val _liveInfoOutput = MutableStateFlow("")
-    val infoOutput: Flow<String>
-        get() = _liveInfoOutput
+    private val _infoMessageFlow = MutableStateFlow("")
+    val infoMessageFlow: Flow<String>
+        get() = _infoMessageFlow
             .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
 
-    private val _liveErrorOutput = MutableStateFlow("")
-    val errorOutput: Flow<String>
-        get() = _liveErrorOutput
+    private val _errorMessageFlow = MutableStateFlow("")
+    val errorMessageFlow: Flow<String>
+        get() = _errorMessageFlow
             .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
 
@@ -71,75 +65,23 @@ internal class ArduinoHelper
         observeBaudRate()
     }
 
-    /**
-     * register the Arduino Permission Broadcast Receiver.
-     */
-//    fun askForConnectionPermission() {
-//        val usbDevices = usbManager.deviceList
-//        _liveInfoOutput.value =
-//            context.getString(R.string.helper_info_checking_attached_usb_devices)
-//        if (usbDevices.isNotEmpty()) {
-//            for (device in usbDevices) {
-//                if (!device.value.isOfficialArduinoBoard()) {
-//                    _liveErrorOutput.value =
-//                        context.getString(R.string.helper_error_device_not_found)
-//                    _liveErrorOutput.value =
-//                        context.getString(R.string.helper_error_connecting_anyway)
-//                }
-//                connect(device)
-//            }
-//        } else {
-//            _liveErrorOutput.value = ""
-//            _liveErrorOutput.value =
-//                context.getString(R.string.helper_error_usb_devices_not_attached)
-//        }
-//    }
-
     fun disconnect() {
         try {
             if (::connection.isInitialized) connection.close()
-            _liveOutput.value = context.getString(R.string.helper_info_serial_connection_closed)
+            _messageFlow.value = context.getString(R.string.helper_info_serial_connection_closed)
         } catch (e: UninitializedPropertyAccessException) {
-            _liveErrorOutput.value =
+            _errorMessageFlow.value =
                 context.getString(R.string.helper_error_connection_not_ready_to_close)
 
-            _liveErrorOutput.value = "${e.localizedMessage}\n"
+            _errorMessageFlow.value = "${e.localizedMessage}\n"
         } catch (e: Exception) {
-            _liveErrorOutput.value = context.getString(
+            _errorMessageFlow.value = context.getString(
                     R.string.helper_error_connection_failed_to_close
                 )
-            _liveErrorOutput.value = "${e.localizedMessage}\n"
+            _errorMessageFlow.value = "${e.localizedMessage}\n"
         }
     }
 
-//    private fun connect(device: MutableMap.MutableEntry<String, UsbDevice>) {
-//        val permissionIntent = PendingIntent.getBroadcast(
-//            context,
-//            0,
-//            Intent(Constants.ACTION_USB_PERMISSION),
-//            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-//        )
-//
-//        ContextCompat.registerReceiver(
-//            context,
-//            arduinoPermReceiver,
-//            IntentFilter(Constants.ACTION_USB_PERMISSION),
-//            ContextCompat.RECEIVER_EXPORTED
-//        )
-//
-//        Log.i(TAG, "receiver:\n$arduinoPermReceiver")
-//        Log.i(TAG, "usb device before request permission:\n${device.value}")
-//        usbManager.requestPermission(device.value, permissionIntent)
-//
-//        _liveInfoOutput.value = context.getString(R.string.helper_info_usb_permission_requested)
-//    }
-
-    /**
-     * use this live object in activity
-     * to call `openDeviceAndPort()` method when the device is available.
-      */
-    fun getGrantedDevice() = arduinoPermReceiver.liveGrantedDevice
-
     /**
      * This method should be called after the permission is granted to access the Arduino via USB.
      */
@@ -150,22 +92,22 @@ internal class ArduinoHelper
             serialPort = UsbSerialDevice.createUsbSerialDevice(device, connection)
         } catch (e: IllegalStateException) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.value =
+            _errorMessageFlow.value =
                 context.getString(R.string.helper_error_connection_closed_unexpectedly)
         } catch (e: NullPointerException) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.value = context.getString(
+            _errorMessageFlow.value = context.getString(
                 R.string.helper_error_connection_failed_to_open)
         } catch (e: Exception) {
             Log.e(TAG, "${e.message}")
-            _liveErrorOutput.value =
+            _errorMessageFlow.value =
                 context.getString(R.string.helper_error_connection_failed_to_open_unknown)
         }
 
         if (::serialPort.isInitialized)
             prepareSerialPort(serialPort)
         else {
-            _liveInfoOutput.value = context.getString(R.string.helper_error_serial_port_is_null)
+            _infoMessageFlow.value = context.getString(R.string.helper_error_serial_port_is_null)
             if (::connection.isInitialized) connection.close()
         }
     }
@@ -185,10 +127,10 @@ internal class ArduinoHelper
                 it.setParity(UsbSerialInterface.PARITY_NONE)
                 it.setFlowControl(UsbSerialInterface.FLOW_CONTROL_OFF)
                 it.read(arduinoSerialReceiver) // messages will be received from the receiver.
-                _liveInfoOutput.value =
+                _infoMessageFlow.value =
                     context.getString(R.string.helper_info_serial_connection_opened)
             } else { // serial port not opened.
-                _liveErrorOutput.value =
+                _errorMessageFlow.value =
                     context.getString(R.string.helper_error_serial_connection_not_opened)
             }
         }
@@ -202,15 +144,15 @@ internal class ArduinoHelper
             if (::serialPort.isInitialized && command.isNotBlank()) {
                 serialPort.write(command.toByteArray())
                 // go to next line because the answer might be sent in more than one part.
-                _liveOutput.value = context.getString(R.string.next_line)
+                _messageFlow.value = context.getString(R.string.next_line)
                 true
             } else {
-                _liveErrorOutput.value =
+                _errorMessageFlow.value =
                     context.getString(R.string.helper_error_serial_port_is_null)
                 false
             }
         } catch (e: Exception) {
-            _liveErrorOutput.value = context.getString(R.string.helper_error_write_problem) +
+            _errorMessageFlow.value = context.getString(R.string.helper_error_write_problem) +
                     " \n${e.localizedMessage}\n"
             Log.e(TAG, "$e")
             false
@@ -224,14 +166,14 @@ internal class ArduinoHelper
         CoroutineScope(Dispatchers.IO).launch {
             getBaudRate().collect { baudRate ->
                 currentBaudRate = baudRate
-                _liveInfoOutput.value = String.format(
+                _infoMessageFlow.value = String.format(
                     context.getString(R.string.helper_info_baud_rate_applying), baudRate)
                 if (::serialPort.isInitialized) {
                     updateSerialPortBaudRate(baudRate)
-                    _liveInfoOutput.value = String.format(
+                    _infoMessageFlow.value = String.format(
                         context.getString(R.string.helper_info_baud_rate_applied), baudRate)
                 } else {
-                    _liveErrorOutput.value =
+                    _errorMessageFlow.value =
                         context.getString(R.string.helper_error_baud_rate_failed_to_apply_no_connection)
                 }
             }
@@ -245,7 +187,8 @@ internal class ArduinoHelper
         try {
             serialPort.setBaudRate(baudRate)
         } catch (e: Exception) {
-            _liveErrorOutput.value = context.getString(R.string.helper_error_applying_baud_rate)
+            _errorMessageFlow.value = context.getString(R.string.helper_error_applying_baud_rate) +
+                    " \n${e.localizedMessage}"
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
index 0aef0c91..1ef924ff 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
@@ -5,13 +5,17 @@ import kotlinx.coroutines.flow.Flow
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import javax.inject.Inject
 
+/**
+ * Created by Ali Kabiri on 07.05.2025.
+ */
+
 internal interface IArduinoUseCase {
     fun openDeviceAndPort(device: UsbDevice)
     fun disconnect()
     fun serialWrite(command: String): Boolean
-    val output: Flow<String>
-    val infoOutput: Flow<String>
-    val errorOutput: Flow<String>
+    val messageFlow: Flow<String>
+    val infoMessageFlow: Flow<String>
+    val errorMessageFlow: Flow<String>
 }
 
 internal class ArduinoUseCase
@@ -19,7 +23,6 @@ internal class ArduinoUseCase
     private val arduinoHelper: ArduinoHelper
 ) : IArduinoUseCase {
     override fun openDeviceAndPort(device: UsbDevice) {
-        // Delegate the connection logic to the helper
         arduinoHelper.openDeviceAndPort(device)
     }
 
@@ -31,9 +34,9 @@ internal class ArduinoUseCase
         return arduinoHelper.serialWrite(command)
     }
 
-    override val output get() = arduinoHelper.output
+    override val messageFlow get() = arduinoHelper.messageFlow
 
-    override val infoOutput get() = arduinoHelper.infoOutput
+    override val infoMessageFlow get() = arduinoHelper.infoMessageFlow
 
-    override val errorOutput get() = arduinoHelper.errorOutput
+    override val errorMessageFlow get() = arduinoHelper.errorMessageFlow
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index c0d02293..1b018805 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -83,13 +83,13 @@ internal class MainActivityViewModel
 
     /**
      * Transforms the outputs from ArduinoHelper into spannable text
-     * and merges them in one single live data.
+     * and merges them in one single flow
      */
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
-        val serialOutput = arduinoUseCase.output
-        val serialInfoOutput = arduinoUseCase.infoOutput
-        val serialErrorOutput = arduinoUseCase.errorOutput
+        val serialOutput = arduinoUseCase.messageFlow
+        val serialInfoOutput = arduinoUseCase.infoMessageFlow
+        val serialErrorOutput = arduinoUseCase.errorMessageFlow
 
         val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it

From b553abb817873604a68ab29a2ffae2565b01f7ba Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 10:04:16 +0200
Subject: [PATCH 081/126] refactor: rename ArduinoHelper to ArduinoRepository

---
 .../{ArduinoHelper.kt => ArduinoRepository.kt}   |  2 +-
 .../kabiri/android/usbterminal/di/AppModule.kt   | 10 +++++-----
 .../android/usbterminal/domain/ArduinoUseCase.kt | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename app/src/main/java/org/kabiri/android/usbterminal/arduino/{ArduinoHelper.kt => ArduinoRepository.kt} (99%)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
similarity index 99%
rename from app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
index ec3ec314..e4f047af 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 
 private const val TAG = "ArduinoHelper"
 
-internal class ArduinoHelper
+internal class ArduinoRepository
 @Inject constructor(
     private val context: Context,
     private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 34236e59..a5a77ab2 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -11,7 +11,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import org.kabiri.android.usbterminal.arduino.ArduinoHelper
+import org.kabiri.android.usbterminal.arduino.ArduinoRepository
 import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
@@ -53,8 +53,8 @@ internal class AppModule {
         arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
         arduinoSerialReceiver: ArduinoSerialReceiver,
         getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
-    ): ArduinoHelper {
-        return ArduinoHelper(
+    ): ArduinoRepository {
+        return ArduinoRepository(
             context = context,
             arduinoPermReceiver = arduinoPermReceiver,
             arduinoSerialReceiver = arduinoSerialReceiver,
@@ -98,9 +98,9 @@ internal class AppModule {
 
     @Provides
     fun provideArduinoUseCase(
-        arduinoHelper: ArduinoHelper,
+        arduinoRepository: ArduinoRepository,
     ): IArduinoUseCase {
-        return ArduinoUseCase(arduinoHelper = arduinoHelper)
+        return ArduinoUseCase(arduinoRepository = arduinoRepository)
     }
 
     @Provides
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
index 1ef924ff..bd942e7e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
@@ -2,7 +2,7 @@ package org.kabiri.android.usbterminal.domain
 
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
-import org.kabiri.android.usbterminal.arduino.ArduinoHelper
+import org.kabiri.android.usbterminal.arduino.ArduinoRepository
 import javax.inject.Inject
 
 /**
@@ -20,23 +20,23 @@ internal interface IArduinoUseCase {
 
 internal class ArduinoUseCase
 @Inject constructor(
-    private val arduinoHelper: ArduinoHelper
+    private val arduinoRepository: ArduinoRepository
 ) : IArduinoUseCase {
     override fun openDeviceAndPort(device: UsbDevice) {
-        arduinoHelper.openDeviceAndPort(device)
+        arduinoRepository.openDeviceAndPort(device)
     }
 
     override fun disconnect() {
-        arduinoHelper.disconnect()
+        arduinoRepository.disconnect()
     }
 
     override fun serialWrite(command: String): Boolean {
-        return arduinoHelper.serialWrite(command)
+        return arduinoRepository.serialWrite(command)
     }
 
-    override val messageFlow get() = arduinoHelper.messageFlow
+    override val messageFlow get() = arduinoRepository.messageFlow
 
-    override val infoMessageFlow get() = arduinoHelper.infoMessageFlow
+    override val infoMessageFlow get() = arduinoRepository.infoMessageFlow
 
-    override val errorMessageFlow get() = arduinoHelper.errorMessageFlow
+    override val errorMessageFlow get() = arduinoRepository.errorMessageFlow
 }
\ No newline at end of file

From 748fe74adf157557a132ea5ed4f37328c5ef4591 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 10:05:09 +0200
Subject: [PATCH 082/126] refactor: update ArduinoRepository TAG

---
 .../kabiri/android/usbterminal/arduino/ArduinoRepository.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
index e4f047af..80fb7288 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
@@ -18,7 +18,6 @@ import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
 
-
 /**
  * Created by Ali Kabiri on 13.04.20.
  *
@@ -27,7 +26,7 @@ import javax.inject.Inject
  *  registers the Arduino Permission Broadcast Receiver.
  */
 
-private const val TAG = "ArduinoHelper"
+private const val TAG = "ArduinoRepository"
 
 internal class ArduinoRepository
 @Inject constructor(

From 86a3c60bc3f14bc8b9451bc883d26f29895866ae Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 12:27:44 +0200
Subject: [PATCH 083/126] refactor: hopefully separate usb specific and arduino
 logic

---
 .../android/usbterminal/MainActivity.kt       |  10 +-
 .../data/repository/UsbRepository.kt          |  27 +++--
 .../android/usbterminal/di/AppModule.kt       |  38 ++++---
 .../android/usbterminal/domain/UsbUseCase.kt  |   5 +-
 .../extensions/ResourceProvider.kt            |  21 ++++
 .../extensions/UsbDeviceExtensions.kt         |   9 ++
 .../viewmodel/MainActivityViewModel.kt        | 100 +++++++++++++-----
 app/src/main/res/values/strings.xml           |   2 +-
 8 files changed, 145 insertions(+), 67 deletions(-)
 create mode 100644 app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index dc0ae18c..f98f963e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -55,15 +55,7 @@ class MainActivity : AppCompatActivity() {
         tvOutput.movementMethod = ScrollingMovementMethod()
 
         lifecycleScope.launchWhenResumed {
-            viewModel.getLiveOutput().collect {
-                val spannable = SpannableString(it.text)
-                spannable.setSpan(
-                    it.getAppearance(this@MainActivity),
-                    0,
-                    it.text.length,
-                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
+            viewModel.getLiveOutput()
         }
 
         lifecycleScope.launchWhenResumed {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index 7121325c..dc56295b 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -1,23 +1,20 @@
 package org.kabiri.android.usbterminal.data.repository
 
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
-import android.app.PendingIntent
-import android.content.IntentFilter
 import androidx.core.content.ContextCompat
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.kabiri.android.usbterminal.Constants
-import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
-import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
-import org.kabiri.android.usbterminal.model.ArduinoDevice
 import javax.inject.Inject
 
 internal interface IUsbRepository {
     val usbDevice: StateFlow<UsbDevice?>
-    fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit)
+    fun scanForArduinoDevices(): List<UsbDevice>
     fun requestUsbPermission(device: UsbDevice)
     fun onPermissionResult(device: UsbDevice?, granted: Boolean)
     fun disconnect()
@@ -32,15 +29,17 @@ internal class UsbRepository
     private val _usbDevice = MutableStateFlow<UsbDevice?>(null)
     override val usbDevice: StateFlow<UsbDevice?> get() = _usbDevice
 
-    override fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit) {
+    override fun scanForArduinoDevices(): List<UsbDevice> {
         val deviceList = usbManager.deviceList
-        val device = deviceList.values.firstOrNull { usbDevice ->
-            usbDevice.isOfficialArduinoBoard() || usbDevice.isCloneArduinoBoard()
-        }
-        if (device != null) {
-            return onResult(ArduinoDevice(device))
-        }
-        return onResult(null)
+        return deviceList.values.toList()
+
+//        firstOrNull { usbDevice ->
+//            usbDevice.isOfficialArduinoBoard() || usbDevice.isCloneArduinoBoard()
+//        }
+//        if (device != null) {
+//            return ArduinoDevice(device)
+//        }
+//        return null
     }
 
     override fun requestUsbPermission(device: UsbDevice) {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index a5a77ab2..a406cf0e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -27,6 +27,8 @@ import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
 import org.kabiri.android.usbterminal.domain.SetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.UsbUseCase
+import org.kabiri.android.usbterminal.extensions.IResourceProvider
+import org.kabiri.android.usbterminal.extensions.ResourceProvider
 import javax.inject.Singleton
 
 /**
@@ -42,25 +44,16 @@ internal class AppModule {
     ): Context = app.applicationContext
 
     @Provides
-    fun provideArduinoPermissionBroadcastReceiver() = ArduinoPermissionBroadcastReceiver()
+    fun provideResourceProvider(
+        @ApplicationContext
+        context: Context
+    ): IResourceProvider = ResourceProvider(context)
 
     @Provides
-    fun providesArduinoSerialReceiver() = ArduinoSerialReceiver()
+    fun provideArduinoPermissionBroadcastReceiver() = ArduinoPermissionBroadcastReceiver()
 
     @Provides
-    fun providesArduinoHelper(
-        context: Context,
-        arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
-        arduinoSerialReceiver: ArduinoSerialReceiver,
-        getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
-    ): ArduinoRepository {
-        return ArduinoRepository(
-            context = context,
-            arduinoPermReceiver = arduinoPermReceiver,
-            arduinoSerialReceiver = arduinoSerialReceiver,
-            getBaudRate = getCustomBaudRateUseCase,
-        )
-    }
+    fun providesArduinoSerialReceiver() = ArduinoSerialReceiver()
 
     @Singleton
     @Provides
@@ -89,6 +82,21 @@ internal class AppModule {
         return UsbRepository(context = context)
     }
 
+    @Provides
+    fun providesArduinoRepository(
+        context: Context,
+        arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
+        arduinoSerialReceiver: ArduinoSerialReceiver,
+        getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
+    ): ArduinoRepository {
+        return ArduinoRepository(
+            context = context,
+            arduinoPermReceiver = arduinoPermReceiver,
+            arduinoSerialReceiver = arduinoSerialReceiver,
+            getBaudRate = getCustomBaudRateUseCase,
+        )
+    }
+
     @Provides
     fun provideUsbUseCase(
         usbRepository: IUsbRepository,
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
index ff47d502..455ab7ab 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -3,12 +3,11 @@ package org.kabiri.android.usbterminal.domain
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.StateFlow
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
-import org.kabiri.android.usbterminal.model.ArduinoDevice
 import javax.inject.Inject
 
 internal interface IUsbUseCase {
     val usbDevice: StateFlow<UsbDevice?>
-    fun scanForArduinoDevices(onResult: (device: ArduinoDevice?) -> Unit)
+    fun scanForUsbDevices(): List<UsbDevice>
     fun requestPermission(device: UsbDevice)
     fun disconnect()
 }
@@ -19,7 +18,7 @@ internal class UsbUseCase
 ): IUsbUseCase {
     override val usbDevice: StateFlow<UsbDevice?> get() = usbRepository.usbDevice
 
-    override fun scanForArduinoDevices(onResult: (ArduinoDevice?) -> Unit) = usbRepository.scanForArduinoDevices(onResult)
+    override fun scanForUsbDevices(): List<UsbDevice> = usbRepository.scanForArduinoDevices()
 
     override fun requestPermission(device: UsbDevice) = usbRepository.requestUsbPermission(device)
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt b/app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt
new file mode 100644
index 00000000..7b2faa73
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt
@@ -0,0 +1,21 @@
+package org.kabiri.android.usbterminal.extensions
+
+import android.content.Context
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by Ali Kabiri on 07.05.2025.
+ */
+
+interface IResourceProvider {
+    fun getString(resId: Int): String
+}
+
+@Singleton
+class ResourceProvider
+@Inject constructor(
+    private val context: Context,
+) : IResourceProvider {
+    override fun getString(resId: Int): String = context.getString(resId)
+}
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt b/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
index 8abc4623..5fef4203 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
@@ -1,6 +1,7 @@
 package org.kabiri.android.usbterminal.extensions
 
 import android.hardware.usb.UsbDevice
+import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType
 
 internal fun UsbDevice.isOfficialArduinoBoard(): Boolean {
     val vendorId = this.vendorId
@@ -24,4 +25,12 @@ internal fun UsbDevice.isCloneArduinoBoard(): Boolean {
         0x0403 -> productId in listOf(0x6001, 0x6015)
         else -> false
     }
+}
+
+internal fun UsbDevice.getArduinoType(): ArduinoType? {
+    return when {
+        isOfficialArduinoBoard() -> ArduinoType.OFFICIAL
+        isCloneArduinoBoard() -> ArduinoType.CLONE
+        else -> null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 1b018805..d8425174 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -7,14 +7,20 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IArduinoUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
-import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.CLONE
+import org.kabiri.android.usbterminal.extensions.IResourceProvider
+import org.kabiri.android.usbterminal.extensions.getArduinoType
+import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
 import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
 import org.kabiri.android.usbterminal.model.OutputText
 import javax.inject.Inject
@@ -26,7 +32,8 @@ import javax.inject.Inject
 internal class MainActivityViewModel
 @Inject constructor(
     private val arduinoUseCase: IArduinoUseCase,
-    private val usbUseCase: IUsbUseCase
+    private val usbUseCase: IUsbUseCase,
+    private val resourceProvider: IResourceProvider,
 ): ViewModel() {
 
     init {
@@ -38,31 +45,45 @@ internal class MainActivityViewModel
         }
     }
 
+    private val _infoMessageFlow = MutableStateFlow("")
+    val infoMessage: StateFlow<String>
+        get() = _infoMessageFlow
+
+    private val _errorMessageFlow = MutableStateFlow("")
+    val errorMessage: StateFlow<String>
+        get() = _errorMessageFlow
+
     private val _outputLive = MutableStateFlow("")
     val output: StateFlow<String>
         get() = _outputLive
     val output2 = SnapshotStateList<OutputText>()
 
     fun connect() {
-        usbUseCase.scanForArduinoDevices { result ->
-            if (result == null) return@scanForArduinoDevices
-            when (result.type) {
-                OFFICIAL -> {
-//                    _liveErrorOutput.value =
-//                        context.getString(R.string.helper_error_device_not_found)
-//                    _liveErrorOutput.value =
-//                        context.getString(R.string.helper_error_connecting_anyway)
-                    usbUseCase.requestPermission(result.device)
-                }
-                CLONE -> {
-//                    _liveErrorOutput.value = ""
-//                    _liveErrorOutput.value =
-//                        context.getString(R.string.helper_error_usb_devices_not_attached)
-                    usbUseCase.requestPermission(result.device)
-                }
-                else -> {
-
-                }
+        val usbDeviceList = usbUseCase.scanForUsbDevices()
+        if (usbDeviceList.isEmpty()) {
+            _errorMessageFlow.value =
+                resourceProvider.getString(R.string.helper_error_usb_devices_not_attached)
+            return // no usb devices found
+        }
+        val device = usbDeviceList.firstOrNull { it.isOfficialArduinoBoard() || it.isCloneArduinoBoard() }
+        if (device == null) {
+            _errorMessageFlow.value =
+                resourceProvider.getString(R.string.helper_error_arduino_device_not_found)
+            _infoMessageFlow.value =
+                resourceProvider.getString(R.string.helper_error_connecting_anyway)
+
+            // request permission for the unknown device anyways
+            return usbUseCase.requestPermission(usbDeviceList.first())
+        }
+        when (device.getArduinoType()) {
+            OFFICIAL -> {
+                usbUseCase.requestPermission(device)
+            }
+
+            else -> {
+                _infoMessageFlow.value =
+                    resourceProvider.getString(R.string.helper_error_connecting_anyway)
+                usbUseCase.requestPermission(device)
             }
         }
     }
@@ -85,6 +106,27 @@ internal class MainActivityViewModel
      * Transforms the outputs from ArduinoHelper into spannable text
      * and merges them in one single flow
      */
+//    suspend fun getLiveOutput(): StateFlow<OutputText> {
+//
+//        fun Flow<String>.toOutput(type: OutputText.OutputType): Flow<OutputText> =
+//            this.map { text ->
+//                _outputLive.value += text
+//                OutputText(text, type).also { output2.add(it) }
+//            }
+//
+//        // Map each source flow
+//        val normalFlow = arduinoUseCase.messageFlow.toOutput(OutputText.OutputType.TYPE_NORMAL)
+//        val infoFlow = arduinoUseCase.infoMessageFlow.toOutput(OutputText.OutputType.TYPE_INFO)
+//        val errorFlow = arduinoUseCase.errorMessageFlow.toOutput(OutputText.OutputType.TYPE_ERROR)
+//
+//        // Merge flows into a single stream and expose as StateFlow
+//        return merge(normalFlow, infoFlow, errorFlow)
+//            .stateIn(
+//                scope = viewModelScope,
+//                started = SharingStarted.Lazily,
+//                initialValue = OutputText("", OutputText.OutputType.TYPE_NORMAL)
+//            )
+//    }
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
         val serialOutput = arduinoUseCase.messageFlow
@@ -112,9 +154,17 @@ internal class MainActivityViewModel
             return@map outputText
         }
 
-        return liveSpannedOutput
-            .combine(liveSpannedInfoOutput) { a, b -> b }
-            .combine(liveSpannedErrorOutput) { a, b -> b }
-            .stateIn(viewModelScope)
+        return combine(
+            liveSpannedOutput,
+            liveSpannedInfoOutput,
+            liveSpannedErrorOutput
+        ) { normal, info, error ->
+            // Prioritize error output over info, then normal.
+            when {
+                error.text.isNotEmpty() -> error
+                info.text.isNotEmpty() -> info
+                else -> normal
+            }
+        }.stateIn(viewModelScope)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index caf5ec97..3ba19820 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
 
     <!-- Messages -->
     <string name="helper_error_serial_port_is_null">Serial Port is null: The device might be disconnected.\n</string>
-    <string name="helper_error_device_not_found">Arduino Device not found (or the device might be a clone).\n</string>
+    <string name="helper_error_arduino_device_not_found">Arduino Device not found (or the device might be an unknown clone).\n</string>
     <string name="helper_error_connecting_anyway">Connecting anyway (may misbehave)…\n</string>
     <string name="helper_error_usb_devices_not_attached">No USB devices are attached\n</string>
     <string name="helper_error_serial_connection_not_opened">Port not opened - There might be a problem with the serial connection to Arduino\n</string>

From f13bb76e4041159eeb5ccd86543ebbcf663e7b3c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 12:28:39 +0200
Subject: [PATCH 084/126] nitpick: remove commented code

---
 .../android/usbterminal/data/repository/UsbRepository.kt  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index dc56295b..fbd2db6f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -32,14 +32,6 @@ internal class UsbRepository
     override fun scanForArduinoDevices(): List<UsbDevice> {
         val deviceList = usbManager.deviceList
         return deviceList.values.toList()
-
-//        firstOrNull { usbDevice ->
-//            usbDevice.isOfficialArduinoBoard() || usbDevice.isCloneArduinoBoard()
-//        }
-//        if (device != null) {
-//            return ArduinoDevice(device)
-//        }
-//        return null
     }
 
     override fun requestUsbPermission(device: UsbDevice) {

From 48657d429b276192081a2ccdcee5eb542f0df13c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 12:40:50 +0200
Subject: [PATCH 085/126] nitpick: update naming

---
 .../usbterminal/viewmodel/MainActivityViewModel.kt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index d8425174..13b49285 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -7,11 +7,9 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
@@ -133,21 +131,21 @@ internal class MainActivityViewModel
         val serialInfoOutput = arduinoUseCase.infoMessageFlow
         val serialErrorOutput = arduinoUseCase.errorMessageFlow
 
-        val liveSpannedOutput: Flow<OutputText> = serialOutput.map {
+        val arduinoDefaultOutput: Flow<OutputText> = serialOutput.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_NORMAL)
             output2.add(outputText)
             return@map outputText
         }
 
-        val liveSpannedInfoOutput: Flow<OutputText> = serialInfoOutput.map {
+        val arduinoInfoOutput: Flow<OutputText> = serialInfoOutput.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_INFO)
             output2.add(outputText)
             return@map outputText
         }
 
-        val liveSpannedErrorOutput: Flow<OutputText> = serialErrorOutput.map {
+        val arduinoErrorOutput: Flow<OutputText> = serialErrorOutput.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_ERROR)
             output2.add(outputText)
@@ -155,9 +153,9 @@ internal class MainActivityViewModel
         }
 
         return combine(
-            liveSpannedOutput,
-            liveSpannedInfoOutput,
-            liveSpannedErrorOutput
+            arduinoDefaultOutput,
+            arduinoInfoOutput,
+            arduinoErrorOutput
         ) { normal, info, error ->
             // Prioritize error output over info, then normal.
             when {

From 83645ce1be5aa873ab46e40775c06f04f069e6b9 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 12:41:53 +0200
Subject: [PATCH 086/126] nitpick: remove unnecessary intermediate variable

---
 .../usbterminal/viewmodel/MainActivityViewModel.kt     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 13b49285..33a775a6 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -127,25 +127,21 @@ internal class MainActivityViewModel
 //    }
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
-        val serialOutput = arduinoUseCase.messageFlow
-        val serialInfoOutput = arduinoUseCase.infoMessageFlow
-        val serialErrorOutput = arduinoUseCase.errorMessageFlow
-
-        val arduinoDefaultOutput: Flow<OutputText> = serialOutput.map {
+        val arduinoDefaultOutput: Flow<OutputText> = arduinoUseCase.messageFlow.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_NORMAL)
             output2.add(outputText)
             return@map outputText
         }
 
-        val arduinoInfoOutput: Flow<OutputText> = serialInfoOutput.map {
+        val arduinoInfoOutput: Flow<OutputText> = arduinoUseCase.infoMessageFlow.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_INFO)
             output2.add(outputText)
             return@map outputText
         }
 
-        val arduinoErrorOutput: Flow<OutputText> = serialErrorOutput.map {
+        val arduinoErrorOutput: Flow<OutputText> = arduinoUseCase.errorMessageFlow.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_ERROR)
             output2.add(outputText)

From cbdc071e90a15e76bb109010aa3eb6e638a9f4d1 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:17:36 +0200
Subject: [PATCH 087/126] nitpick: remove commented code

---
 .../viewmodel/MainActivityViewModel.kt        | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 33a775a6..aff0ce28 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -54,6 +55,7 @@ internal class MainActivityViewModel
     private val _outputLive = MutableStateFlow("")
     val output: StateFlow<String>
         get() = _outputLive
+
     val output2 = SnapshotStateList<OutputText>()
 
     fun connect() {
@@ -104,29 +106,22 @@ internal class MainActivityViewModel
      * Transforms the outputs from ArduinoHelper into spannable text
      * and merges them in one single flow
      */
-//    suspend fun getLiveOutput(): StateFlow<OutputText> {
-//
-//        fun Flow<String>.toOutput(type: OutputText.OutputType): Flow<OutputText> =
-//            this.map { text ->
-//                _outputLive.value += text
-//                OutputText(text, type).also { output2.add(it) }
-//            }
-//
-//        // Map each source flow
-//        val normalFlow = arduinoUseCase.messageFlow.toOutput(OutputText.OutputType.TYPE_NORMAL)
-//        val infoFlow = arduinoUseCase.infoMessageFlow.toOutput(OutputText.OutputType.TYPE_INFO)
-//        val errorFlow = arduinoUseCase.errorMessageFlow.toOutput(OutputText.OutputType.TYPE_ERROR)
-//
-//        // Merge flows into a single stream and expose as StateFlow
-//        return merge(normalFlow, infoFlow, errorFlow)
-//            .stateIn(
-//                scope = viewModelScope,
-//                started = SharingStarted.Lazily,
-//                initialValue = OutputText("", OutputText.OutputType.TYPE_NORMAL)
-//            )
-//    }
     suspend fun getLiveOutput(): StateFlow<OutputText> {
 
+        val infoOutput: Flow<OutputText> = infoMessage.map {
+            _outputLive.value = _outputLive.value + it
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_INFO)
+            output2.add(outputText)
+            return@map outputText
+        }
+
+        val errorOutput: Flow<OutputText> = errorMessage.map {
+            _outputLive.value = _outputLive.value + it
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_ERROR)
+            output2.add(outputText)
+            return@map outputText
+        }
+
         val arduinoDefaultOutput: Flow<OutputText> = arduinoUseCase.messageFlow.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_NORMAL)
@@ -149,15 +144,19 @@ internal class MainActivityViewModel
         }
 
         return combine(
+            infoOutput,
+            errorOutput,
             arduinoDefaultOutput,
             arduinoInfoOutput,
-            arduinoErrorOutput
-        ) { normal, info, error ->
+            arduinoErrorOutput,
+        ) { info, error, arduinoDefault, arduinoInfo, arduinoError ->
             // Prioritize error output over info, then normal.
             when {
                 error.text.isNotEmpty() -> error
                 info.text.isNotEmpty() -> info
-                else -> normal
+                arduinoError.text.isNotEmpty() -> arduinoError
+                arduinoInfo.text.isNotEmpty() -> arduinoInfo
+                else -> arduinoDefault
             }
         }.stateIn(viewModelScope)
     }

From ba0cffab3ee0b5e06e54b145c41669a840cf3c49 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:18:41 +0200
Subject: [PATCH 088/126] nitpick: remove unused import

---
 .../android/usbterminal/viewmodel/MainActivityViewModel.kt       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index aff0ce28..1f75d76f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine

From 8b4d53d78f568c486a6d406009be5a19ea012082 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:19:04 +0200
Subject: [PATCH 089/126] nitpick: remove unused import

---
 app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index f98f963e..5ad65d3f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -1,7 +1,6 @@
 package org.kabiri.android.usbterminal
 
 import android.os.Bundle
-import android.text.SpannableString
 import android.text.method.ScrollingMovementMethod
 import android.util.Log
 import android.view.KeyEvent

From e8460c0194f1faf8913a59a20dd2e7a0f7c5d4c2 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:20:32 +0200
Subject: [PATCH 090/126] refactor: use launch instead of deprecated
 launchWhenResumed

---
 .../java/org/kabiri/android/usbterminal/MainActivity.kt     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 5ad65d3f..d3f94bca 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -18,6 +18,7 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.extensions.scrollToLastLine
 import org.kabiri.android.usbterminal.ui.setting.SettingModalBottomSheet
 import org.kabiri.android.usbterminal.ui.setting.SettingViewModel
@@ -53,11 +54,8 @@ class MainActivity : AppCompatActivity() {
         // make the text view scrollable:
         tvOutput.movementMethod = ScrollingMovementMethod()
 
-        lifecycleScope.launchWhenResumed {
+        lifecycleScope.launch {
             viewModel.getLiveOutput()
-        }
-
-        lifecycleScope.launchWhenResumed {
             viewModel.output.collect {
                 tvOutput.apply {
                     text = it

From d2e4db6a8c87897782bb54bf3fc55b7ecdab02e7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:21:56 +0200
Subject: [PATCH 091/126] refactor: rename extensions package to util

---
 .../java/org/kabiri/android/usbterminal/MainActivity.kt   | 2 +-
 .../java/org/kabiri/android/usbterminal/di/AppModule.kt   | 4 ++--
 .../org/kabiri/android/usbterminal/model/ArduinoDevice.kt | 4 ++--
 .../usbterminal/{extensions => util}/ResourceProvider.kt  | 2 +-
 .../{extensions => util}/TextViewExtensions.kt            | 2 +-
 .../{extensions => util}/UsbDeviceExtensions.kt           | 2 +-
 .../usbterminal/viewmodel/MainActivityViewModel.kt        | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename app/src/main/java/org/kabiri/android/usbterminal/{extensions => util}/ResourceProvider.kt (88%)
 rename app/src/main/java/org/kabiri/android/usbterminal/{extensions => util}/TextViewExtensions.kt (93%)
 rename app/src/main/java/org/kabiri/android/usbterminal/{extensions => util}/UsbDeviceExtensions.kt (95%)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index d3f94bca..241fd018 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -19,7 +19,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
-import org.kabiri.android.usbterminal.extensions.scrollToLastLine
+import org.kabiri.android.usbterminal.util.scrollToLastLine
 import org.kabiri.android.usbterminal.ui.setting.SettingModalBottomSheet
 import org.kabiri.android.usbterminal.ui.setting.SettingViewModel
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index a406cf0e..92ddf62d 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -27,8 +27,8 @@ import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
 import org.kabiri.android.usbterminal.domain.SetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.UsbUseCase
-import org.kabiri.android.usbterminal.extensions.IResourceProvider
-import org.kabiri.android.usbterminal.extensions.ResourceProvider
+import org.kabiri.android.usbterminal.util.IResourceProvider
+import org.kabiri.android.usbterminal.util.ResourceProvider
 import javax.inject.Singleton
 
 /**
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt b/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
index 36b05e5d..27ee417e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/model/ArduinoDevice.kt
@@ -1,8 +1,8 @@
 package org.kabiri.android.usbterminal.model
 
 import android.hardware.usb.UsbDevice
-import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
-import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
+import org.kabiri.android.usbterminal.util.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.util.isOfficialArduinoBoard
 
 internal data class ArduinoDevice(
     val device: UsbDevice,
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt b/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
similarity index 88%
rename from app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
index 7b2faa73..817c95e6 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/extensions/ResourceProvider.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.extensions
+package org.kabiri.android.usbterminal.util
 
 import android.content.Context
 import javax.inject.Inject
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/TextViewExtensions.kt b/app/src/main/java/org/kabiri/android/usbterminal/util/TextViewExtensions.kt
similarity index 93%
rename from app/src/main/java/org/kabiri/android/usbterminal/extensions/TextViewExtensions.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/util/TextViewExtensions.kt
index cc67497e..4df96b20 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/extensions/TextViewExtensions.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/util/TextViewExtensions.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.extensions
+package org.kabiri.android.usbterminal.util
 
 import android.util.Log
 import android.widget.TextView
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt b/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
similarity index 95%
rename from app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
index 5fef4203..9491d99c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/extensions/UsbDeviceExtensions.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.extensions
+package org.kabiri.android.usbterminal.util
 
 import android.hardware.usb.UsbDevice
 import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 1f75d76f..9b96c725 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -15,10 +15,10 @@ import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IArduinoUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
-import org.kabiri.android.usbterminal.extensions.IResourceProvider
-import org.kabiri.android.usbterminal.extensions.getArduinoType
-import org.kabiri.android.usbterminal.extensions.isCloneArduinoBoard
-import org.kabiri.android.usbterminal.extensions.isOfficialArduinoBoard
+import org.kabiri.android.usbterminal.util.IResourceProvider
+import org.kabiri.android.usbterminal.util.getArduinoType
+import org.kabiri.android.usbterminal.util.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.util.isOfficialArduinoBoard
 import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
 import org.kabiri.android.usbterminal.model.OutputText
 import javax.inject.Inject

From ec36a09cd1d0356498123d9a556af5ca882bfcd8 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 13:23:26 +0200
Subject: [PATCH 092/126] nitpick: add file comment

---
 .../kabiri/android/usbterminal/util/UsbDeviceExtensions.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt b/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
index 9491d99c..eae2a107 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/util/UsbDeviceExtensions.kt
@@ -3,6 +3,12 @@ package org.kabiri.android.usbterminal.util
 import android.hardware.usb.UsbDevice
 import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType
 
+/**
+ * Created by Ali Kabiri on 07.05.2025.
+ *
+ * This file contains extension functions for the UsbDevice class to identify Arduino boards.
+ */
+
 internal fun UsbDevice.isOfficialArduinoBoard(): Boolean {
     val vendorId = this.vendorId
     val productId = this.productId

From e3a0b00e9eafd7ac52c2872ed7246b332e61b974 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Wed, 7 May 2025 14:17:26 +0200
Subject: [PATCH 093/126] refactor: log the output of onPermissionResult

---
 .../data/repository/UsbRepository.kt          |  7 ++++
 .../android/usbterminal/domain/UsbUseCase.kt  |  4 +++
 .../viewmodel/MainActivityViewModel.kt        | 36 +++++++++++++------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index fbd2db6f..b88b2995 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -7,6 +7,7 @@ import android.content.IntentFilter
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
 import androidx.core.content.ContextCompat
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.kabiri.android.usbterminal.Constants
@@ -14,6 +15,7 @@ import javax.inject.Inject
 
 internal interface IUsbRepository {
     val usbDevice: StateFlow<UsbDevice?>
+    val infoMessageFlow: Flow<String>
     fun scanForArduinoDevices(): List<UsbDevice>
     fun requestUsbPermission(device: UsbDevice)
     fun onPermissionResult(device: UsbDevice?, granted: Boolean)
@@ -29,6 +31,10 @@ internal class UsbRepository
     private val _usbDevice = MutableStateFlow<UsbDevice?>(null)
     override val usbDevice: StateFlow<UsbDevice?> get() = _usbDevice
 
+    private val _infoMessageFlow = MutableStateFlow("")
+    override val infoMessageFlow: Flow<String>
+        get() = _infoMessageFlow
+
     override fun scanForArduinoDevices(): List<UsbDevice> {
         val deviceList = usbManager.deviceList
         return deviceList.values.toList()
@@ -52,6 +58,7 @@ internal class UsbRepository
     }
 
     override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
+        _infoMessageFlow.value = "Permission result: ${device?.vendorId}, granted: $granted\n"
         if (granted && device != null) {
             _usbDevice.value = device
         } else {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
index 455ab7ab..04fc59bf 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -1,12 +1,14 @@
 package org.kabiri.android.usbterminal.domain
 
 import android.hardware.usb.UsbDevice
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import javax.inject.Inject
 
 internal interface IUsbUseCase {
     val usbDevice: StateFlow<UsbDevice?>
+    val infoMessageFlow: Flow<String>
     fun scanForUsbDevices(): List<UsbDevice>
     fun requestPermission(device: UsbDevice)
     fun disconnect()
@@ -18,6 +20,8 @@ internal class UsbUseCase
 ): IUsbUseCase {
     override val usbDevice: StateFlow<UsbDevice?> get() = usbRepository.usbDevice
 
+    override val infoMessageFlow: Flow<String> = usbRepository.infoMessageFlow
+
     override fun scanForUsbDevices(): List<UsbDevice> = usbRepository.scanForArduinoDevices()
 
     override fun requestPermission(device: UsbDevice) = usbRepository.requestUsbPermission(device)
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 9b96c725..0ceca24c 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -34,15 +34,6 @@ internal class MainActivityViewModel
     private val resourceProvider: IResourceProvider,
 ): ViewModel() {
 
-    init {
-        // Subscribe to USB device changes.
-        viewModelScope.launch {
-            usbUseCase.usbDevice.collect { device ->
-                device?.let { openDeviceAndPort(it) }
-            }
-        }
-    }
-
     private val _infoMessageFlow = MutableStateFlow("")
     val infoMessage: StateFlow<String>
         get() = _infoMessageFlow
@@ -57,6 +48,16 @@ internal class MainActivityViewModel
 
     val output2 = SnapshotStateList<OutputText>()
 
+    init {
+        // Subscribe to USB device changes.
+        viewModelScope.launch {
+            usbUseCase.usbDevice.collect { device ->
+                _infoMessageFlow.value = "device discovered: ${device?.vendorId}\n"
+                device?.let { openDeviceAndPort(it) }
+            }
+        }
+    }
+
     fun connect() {
         val usbDeviceList = usbUseCase.scanForUsbDevices()
         if (usbDeviceList.isEmpty()) {
@@ -121,6 +122,13 @@ internal class MainActivityViewModel
             return@map outputText
         }
 
+        val usbInfoOutput: Flow<OutputText> = usbUseCase.infoMessageFlow.map {
+            _outputLive.value = _outputLive.value + it
+            val outputText = OutputText(it, OutputText.OutputType.TYPE_INFO)
+            output2.add(outputText)
+            return@map outputText
+        }
+
         val arduinoDefaultOutput: Flow<OutputText> = arduinoUseCase.messageFlow.map {
             _outputLive.value = _outputLive.value + it
             val outputText = OutputText(it, OutputText.OutputType.TYPE_NORMAL)
@@ -157,6 +165,14 @@ internal class MainActivityViewModel
                 arduinoInfo.text.isNotEmpty() -> arduinoInfo
                 else -> arduinoDefault
             }
-        }.stateIn(viewModelScope)
+        }.combine(usbInfoOutput) { outputText, usbInfo ->
+            // Prioritize USB info output over the rest.
+            if (usbInfo.text.isNotEmpty()) {
+                usbInfo
+            } else {
+                outputText
+            }
+        }
+            .stateIn(viewModelScope)
     }
 }
\ No newline at end of file

From e4c7403ac1d65c6037d67b69e6851ac4c82ad6cd Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 13:01:10 +0200
Subject: [PATCH 094/126] chore: hopefully update AGP to 8.10

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f6f52206..28c164e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version '8.7.2' apply false
+    id("com.android.application") version '8.10.0' apply false
     id("org.jetbrains.kotlin.android") version "2.1.20" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.1.20"
     id("org.sonarqube") version "3.5.0.2730"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e..e2847c82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From eabd45dfd3a713f4db48dd550bd6e4c02060960c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 14:29:22 +0200
Subject: [PATCH 095/126] chore(deps): add mockk; organize dependencies

---
 app/build.gradle.kts | 38 ++++++++++++++++++++++++++------------
 build.gradle         |  1 +
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f6db4f7..b9b6f881 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -81,6 +81,13 @@ android {
         }
     }
 
+    packaging {
+        resources {
+            excludes += "META-INF/LICENSE.md"
+            excludes += "META-INF/LICENSE-notice.md"
+        }
+    }
+
     namespace = "org.kabiri.android.usbterminal"
 
 }
@@ -203,6 +210,7 @@ val firebase_bom_version: String by project
 val hilt_version: String by project
 val coroutines_version: String by project
 val material_version: String by project
+val mockk_version: String by project
 dependencies {
 
     implementation("androidx.appcompat:appcompat:1.7.0")
@@ -239,34 +247,40 @@ dependencies {
     // Other UI Libraries
     implementation("com.google.android.material:material:$material_version")
 
-
     // data
     implementation("androidx.datastore:datastore-preferences:1.1.4")
 
-    // hilt testing
-    // more info:
-    // https://developer.android.com/training/dependency-injection/hilt-testing
-    androidTestImplementation("com.google.dagger:hilt-android-testing:$hilt_version")
-    kaptAndroidTest("com.google.dagger:hilt-android-compiler:$hilt_version")
-
     // unit test libs
     testImplementation("junit:junit:4.13.2")
-    testImplementation("com.google.truth:truth:1.1.3")
 
     // instrumented test libs
     androidTestImplementation("androidx.test:core:1.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
-    androidTestImplementation("androidx.test.ext:truth:1.6.0")
-    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
-    // Espresso
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+
     // Hamcrest for view matching
     androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
 
-    // 3rd party
+    // coroutine testing
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
+    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
+
+    // google truth for assertions
+    testImplementation("com.google.truth:truth:1.1.3")
+    androidTestImplementation("androidx.test.ext:truth:1.6.0")
+
+    // mockk
+    testImplementation("io.mockk:mockk-android:$mockk_version")
+    testImplementation("io.mockk:mockk-agent:$mockk_version")
+    androidTestImplementation("io.mockk:mockk-android:$mockk_version")
+    androidTestImplementation("io.mockk:mockk-agent:$mockk_version")
+
+    // hilt testing - https://developer.android.com/training/dependency-injection/hilt-testing
+    androidTestImplementation("com.google.dagger:hilt-android-testing:$hilt_version")
+    kaptAndroidTest("com.google.dagger:hilt-android-compiler:$hilt_version")
 
     // Android Serial Controller
     implementation("com.github.superus8r:UsbSerial:6.1.1")
diff --git a/build.gradle b/build.gradle
index 28c164e8..30e0c129 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
         jacoco_version = "0.8.8"
         kotlin_version = "2.1.20"
         material_version = "1.12.0"
+        mockk_version = "1.14.2"
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

From 7455801dcf618c6d9a67872aa13a13fc4bec0d18 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 14:32:39 +0200
Subject: [PATCH 096/126] tests: make sure scanForArduinoDevices works as
 expected

---
 .../data/repository/UsbRepositoryTest.kt      | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
new file mode 100644
index 00000000..1ed768ad
--- /dev/null
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -0,0 +1,68 @@
+package org.kabiri.android.usbterminal.data.repository
+
+import android.content.Context
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbManager
+import com.google.common.truth.Truth.assertThat
+import io.mockk.clearAllMocks
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class UsbRepositoryTest {
+
+    private val testDispatcher: TestDispatcher = StandardTestDispatcher()
+
+    private val mockContext: Context = mockk(relaxed = true)
+    private val mockUsbManager: UsbManager = mockk(relaxed = true)
+
+    private lateinit var sut: UsbRepository
+
+    @Before
+    fun setUp() {
+        Dispatchers.setMain(testDispatcher)
+    }
+
+    @After
+    fun cleanUp() {
+        Dispatchers.resetMain()
+        clearAllMocks()
+    }
+
+    @Test
+    fun `scanForArduinoDevices returns list of usb devices from usbManager`() = runTest {
+        // arrange
+        val mockUsbDevice1: UsbDevice = mockk()
+        val mockUsbDevice2: UsbDevice = mockk()
+        val expectedDeviceMap: HashMap<String, UsbDevice> = hashMapOf(
+            "device1" to mockUsbDevice1,
+            "device2" to mockUsbDevice2
+        )
+        val expectedDeviceList: List<UsbDevice> = expectedDeviceMap.values.toList()
+        every { mockContext.getSystemService(UsbManager::class.java) } returns mockUsbManager
+        every { mockUsbManager.deviceList } returns expectedDeviceMap
+        sut = UsbRepository(mockContext)
+
+        // act
+        val actualDeviceList = sut.scanForArduinoDevices()
+        advanceUntilIdle()
+
+        // assert
+        verify { mockUsbManager.deviceList }
+        assertThat(actualDeviceList).isNotEmpty()
+        assertThat(actualDeviceList).hasSize(actualDeviceList.size)
+        assertThat(actualDeviceList.containsAll(expectedDeviceList)).isTrue()
+    }
+}
\ No newline at end of file

From e1261fdd33c60d071b39de3192864a5c3d92862d Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 15:09:32 +0200
Subject: [PATCH 097/126] tests: make sure requestUsbPermission works as
 expected

---
 .../data/repository/UsbRepositoryTest.kt      | 73 ++++++++++++++++---
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index 1ed768ad..f26c44a8 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -1,12 +1,17 @@
 package org.kabiri.android.usbterminal.data.repository
 
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
+import androidx.core.content.ContextCompat
 import com.google.common.truth.Truth.assertThat
 import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.mockkStatic
 import io.mockk.verify
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -19,6 +24,7 @@ import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.kabiri.android.usbterminal.Constants
 
 @OptIn(ExperimentalCoroutinesApi::class)
 internal class UsbRepositoryTest {
@@ -27,12 +33,22 @@ internal class UsbRepositoryTest {
 
     private val mockContext: Context = mockk(relaxed = true)
     private val mockUsbManager: UsbManager = mockk(relaxed = true)
+    val mockUsbDevice1: UsbDevice = mockk()
+    val mockUsbDevice2: UsbDevice = mockk()
 
     private lateinit var sut: UsbRepository
 
     @Before
     fun setUp() {
         Dispatchers.setMain(testDispatcher)
+
+        every { mockUsbManager.deviceList } returns hashMapOf(
+            "device1" to mockUsbDevice1,
+            "device2" to mockUsbDevice2,
+        )
+        every { mockContext.getSystemService(UsbManager::class.java) } returns mockUsbManager
+
+        sut = UsbRepository(mockContext)
     }
 
     @After
@@ -44,16 +60,7 @@ internal class UsbRepositoryTest {
     @Test
     fun `scanForArduinoDevices returns list of usb devices from usbManager`() = runTest {
         // arrange
-        val mockUsbDevice1: UsbDevice = mockk()
-        val mockUsbDevice2: UsbDevice = mockk()
-        val expectedDeviceMap: HashMap<String, UsbDevice> = hashMapOf(
-            "device1" to mockUsbDevice1,
-            "device2" to mockUsbDevice2
-        )
-        val expectedDeviceList: List<UsbDevice> = expectedDeviceMap.values.toList()
-        every { mockContext.getSystemService(UsbManager::class.java) } returns mockUsbManager
-        every { mockUsbManager.deviceList } returns expectedDeviceMap
-        sut = UsbRepository(mockContext)
+        val expectedDeviceList = listOf(mockUsbDevice1, mockUsbDevice2)
 
         // act
         val actualDeviceList = sut.scanForArduinoDevices()
@@ -65,4 +72,50 @@ internal class UsbRepositoryTest {
         assertThat(actualDeviceList).hasSize(actualDeviceList.size)
         assertThat(actualDeviceList.containsAll(expectedDeviceList)).isTrue()
     }
+
+    @Test
+    fun `requestUsbPermission registers receiver and requests permission`() = runTest {
+        // arrange
+        mockkStatic(PendingIntent::class)
+        mockkStatic(ContextCompat::class)
+        val mockIntent: PendingIntent = mockk()
+        every {
+            PendingIntent.getBroadcast(
+                mockContext,
+                0,
+                any(),
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+        } returns mockIntent
+        every {
+            ContextCompat.registerReceiver(
+                mockContext,
+                any<UsbPermissionReceiver>(),
+                IntentFilter(Constants.ACTION_USB_PERMISSION),
+                ContextCompat.RECEIVER_EXPORTED
+            )
+        } returns null
+
+        // act
+        sut.requestUsbPermission(mockUsbDevice1)
+        advanceUntilIdle()
+
+        // assert
+        assertThat(sut.usbDevice.value).isEqualTo(mockUsbDevice1)
+        verify {
+            PendingIntent.getBroadcast(
+                mockContext,
+                0,
+                any<Intent>(),
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+            ContextCompat.registerReceiver(
+                mockContext,
+                any<UsbPermissionReceiver>(),
+                any<IntentFilter>(),
+                ContextCompat.RECEIVER_EXPORTED
+            )
+            mockUsbManager.requestPermission(mockUsbDevice1, mockIntent)
+        }
+    }
 }
\ No newline at end of file

From 75aab03a7528d7f61fa7ceb11f1b4d60bc0da51b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 15:30:56 +0200
Subject: [PATCH 098/126] tests: make sure onPermissionResult works as expected

---
 .../data/repository/UsbRepositoryTest.kt      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index f26c44a8..e34a5096 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -15,6 +15,7 @@ import io.mockk.mockkStatic
 import io.mockk.verify
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -118,4 +119,42 @@ internal class UsbRepositoryTest {
             mockUsbManager.requestPermission(mockUsbDevice1, mockIntent)
         }
     }
+
+    @Test
+    fun `onPermissionResult updates usbDevice and emits info when granted`() = runTest(testDispatcher) {
+        // arrange
+        val fakeVendorId = 1234
+        val fakeGranted = true
+        every { mockUsbDevice1.vendorId } returns fakeVendorId
+        val expected = "Permission result: $fakeVendorId, granted: $fakeGranted\n"
+
+        // act
+        sut.onPermissionResult(
+            device = mockUsbDevice1,
+            granted = fakeGranted
+        )
+
+        // assert
+        assertThat(sut.usbDevice.value).isEqualTo(mockUsbDevice1)
+        assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
+    }
+
+    @Test
+    fun `onPermissionResult clears usbDevice and emits info when denied`() = runTest(testDispatcher) {
+        // arrange
+        val fakeVendorId = 1234
+        val fakeGranted = false
+        every { mockUsbDevice1.vendorId } returns fakeVendorId
+        val expected = "Permission result: ${mockUsbDevice1.vendorId}, granted: $fakeGranted\n"
+
+        // act
+        sut.onPermissionResult(
+            device = mockUsbDevice1,
+            granted = fakeGranted
+        )
+
+        // assert
+        assertThat(sut.usbDevice.value).isNull()
+        assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
+    }
 }
\ No newline at end of file

From 5a15f87efe1b3bfc87aaa5f418ca6fe431c5a3c7 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 24 May 2025 15:40:05 +0200
Subject: [PATCH 099/126] tests: make sure onDisconnect works as expected

---
 .../data/repository/UsbRepositoryTest.kt       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index e34a5096..234e006f 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -157,4 +157,22 @@ internal class UsbRepositoryTest {
         assertThat(sut.usbDevice.value).isNull()
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
+
+    @Test
+    fun `onDisconnect clears usbDevice`() = runTest {
+        // arrange
+        mockkStatic(PendingIntent::class)
+        mockkStatic(ContextCompat::class)
+        every { PendingIntent.getBroadcast(any(), any(), any(), any()) } returns mockk()
+        sut.requestUsbPermission(mockUsbDevice1)
+        advanceUntilIdle()
+        assertThat(sut.usbDevice.value).isNotNull()
+
+        // act
+        sut.disconnect()
+        advanceUntilIdle()
+
+        // assert
+        assertThat(sut.usbDevice.value).isNull()
+    }
 }
\ No newline at end of file

From 957a1401a2371f4d0851217a5096102b4bb2436e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 09:39:04 +0200
Subject: [PATCH 100/126] fix: unregister receiver once the permission result
 is received

---
 .../usbterminal/data/repository/UsbPermissionReceiver.kt     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
index 47e46264..a90f6771 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
@@ -7,12 +7,15 @@ import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
 import org.kabiri.android.usbterminal.Constants
 
-internal class UsbPermissionReceiver(private val repository: UsbRepository) : BroadcastReceiver() {
+internal class UsbPermissionReceiver(
+    private val repository: IUsbRepository,
+) : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent?.action == Constants.ACTION_USB_PERMISSION) {
             val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
             val granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
             repository.onPermissionResult(device, granted)
+            context?.unregisterReceiver(this)
         }
     }
 }
\ No newline at end of file

From 388e2bbc2e87323a7c5155f28fc6589823da2407 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 09:39:46 +0200
Subject: [PATCH 101/126] refactor: use sharedFlow for the usbDevice

---
 .../data/repository/UsbRepository.kt          | 41 +++++++++++--------
 .../android/usbterminal/di/AppModule.kt       |  7 +++-
 .../android/usbterminal/domain/UsbUseCase.kt  |  6 +--
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index b88b2995..1df26e94 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -7,14 +7,18 @@ import android.content.IntentFilter
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
 import androidx.core.content.ContextCompat
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.Constants
 import javax.inject.Inject
 
 internal interface IUsbRepository {
-    val usbDevice: StateFlow<UsbDevice?>
+    val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
     fun scanForArduinoDevices(): List<UsbDevice>
     fun requestUsbPermission(device: UsbDevice)
@@ -24,16 +28,16 @@ internal interface IUsbRepository {
 
 internal class UsbRepository
 @Inject constructor(
-    private val context: Context
+    private val context: Context,
+    private val scope: CoroutineScope,
 ): IUsbRepository {
     private val usbManager = context.getSystemService(UsbManager::class.java)
 
-    private val _usbDevice = MutableStateFlow<UsbDevice?>(null)
-    override val usbDevice: StateFlow<UsbDevice?> get() = _usbDevice
+    private val _usbDevice = MutableSharedFlow<UsbDevice?>(replay = 1)
+    override val usbDevice: SharedFlow<UsbDevice?> = _usbDevice.asSharedFlow()
 
-    private val _infoMessageFlow = MutableStateFlow("")
-    override val infoMessageFlow: Flow<String>
-        get() = _infoMessageFlow
+    private val _infoMessageFlow = MutableStateFlow<String>("")
+    override val infoMessageFlow: SharedFlow<String> = _infoMessageFlow.asSharedFlow()
 
     override fun scanForArduinoDevices(): List<UsbDevice> {
         val deviceList = usbManager.deviceList
@@ -41,13 +45,14 @@ internal class UsbRepository
     }
 
     override fun requestUsbPermission(device: UsbDevice) {
+        val intent = Intent(Constants.ACTION_USB_PERMISSION)
         val permissionIntent = PendingIntent.getBroadcast(
             context,
             0,
-            Intent(Constants.ACTION_USB_PERMISSION),
+            intent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
-        _usbDevice.value = device
+        scope.launch { _usbDevice.emit(device) }
         ContextCompat.registerReceiver(
             context,
             UsbPermissionReceiver(this),
@@ -58,15 +63,19 @@ internal class UsbRepository
     }
 
     override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
-        _infoMessageFlow.value = "Permission result: ${device?.vendorId}, granted: $granted\n"
-        if (granted && device != null) {
-            _usbDevice.value = device
-        } else {
-            _usbDevice.value = null
+        scope.launch {
+            _infoMessageFlow.emit("Permission result: ${device?.vendorId}, granted: $granted\n")
+            if (granted && device != null) {
+                _usbDevice.emit(device)
+            } else {
+                _usbDevice.emit(null)
+            }
         }
     }
 
     override fun disconnect() {
-        _usbDevice.value = null
+        scope.launch {
+            _usbDevice.emit(null)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 92ddf62d..2e3da59a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -11,6 +11,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import org.kabiri.android.usbterminal.arduino.ArduinoRepository
 import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
@@ -79,7 +81,10 @@ internal class AppModule {
     fun provideUsbRepository(
         context: Context,
     ): IUsbRepository {
-        return UsbRepository(context = context)
+        return UsbRepository(
+            context = context,
+            scope = CoroutineScope(Dispatchers.Default)
+        )
     }
 
     @Provides
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
index 04fc59bf..27051b65 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -2,12 +2,12 @@ package org.kabiri.android.usbterminal.domain
 
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import javax.inject.Inject
 
 internal interface IUsbUseCase {
-    val usbDevice: StateFlow<UsbDevice?>
+    val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
     fun scanForUsbDevices(): List<UsbDevice>
     fun requestPermission(device: UsbDevice)
@@ -18,7 +18,7 @@ internal class UsbUseCase
 @Inject constructor(
     private val usbRepository: IUsbRepository
 ): IUsbUseCase {
-    override val usbDevice: StateFlow<UsbDevice?> get() = usbRepository.usbDevice
+    override val usbDevice: SharedFlow<UsbDevice?> = usbRepository.usbDevice
 
     override val infoMessageFlow: Flow<String> = usbRepository.infoMessageFlow
 

From cf689cb724452259961ca3d8ad334b0147f9b69b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 09:43:26 +0200
Subject: [PATCH 102/126] tests: update tests to match the new changes to
 sharedFlow usage in usbRepository

---
 .../data/repository/UsbRepositoryTest.kt         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index 234e006f..3b437660 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -18,6 +18,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestDispatcher
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runTest
@@ -49,7 +50,10 @@ internal class UsbRepositoryTest {
         )
         every { mockContext.getSystemService(UsbManager::class.java) } returns mockUsbManager
 
-        sut = UsbRepository(mockContext)
+        sut = UsbRepository(
+            context = mockContext,
+            scope = TestScope(testDispatcher)
+        )
     }
 
     @After
@@ -102,7 +106,7 @@ internal class UsbRepositoryTest {
         advanceUntilIdle()
 
         // assert
-        assertThat(sut.usbDevice.value).isEqualTo(mockUsbDevice1)
+        assertThat(sut.usbDevice.first()).isEqualTo(mockUsbDevice1)
         verify {
             PendingIntent.getBroadcast(
                 mockContext,
@@ -135,7 +139,7 @@ internal class UsbRepositoryTest {
         )
 
         // assert
-        assertThat(sut.usbDevice.value).isEqualTo(mockUsbDevice1)
+        assertThat(sut.usbDevice.first()).isEqualTo(mockUsbDevice1)
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
 
@@ -154,7 +158,7 @@ internal class UsbRepositoryTest {
         )
 
         // assert
-        assertThat(sut.usbDevice.value).isNull()
+        assertThat(sut.usbDevice.first()).isNull()
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
 
@@ -166,13 +170,13 @@ internal class UsbRepositoryTest {
         every { PendingIntent.getBroadcast(any(), any(), any(), any()) } returns mockk()
         sut.requestUsbPermission(mockUsbDevice1)
         advanceUntilIdle()
-        assertThat(sut.usbDevice.value).isNotNull()
+        assertThat(sut.usbDevice.first()).isNotNull()
 
         // act
         sut.disconnect()
         advanceUntilIdle()
 
         // assert
-        assertThat(sut.usbDevice.value).isNull()
+        assertThat(sut.usbDevice.first()).isNull()
     }
 }
\ No newline at end of file

From 4a7e21ccaa657f3dfe68684d3001d29c35a9d308 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:11:48 +0200
Subject: [PATCH 103/126] fix: avoid having to click connect twice for
 connecting to usb device

---
 .../android/usbterminal/MainActivity.kt       |  7 ++-
 .../data/repository/UsbRepository.kt          | 48 ++++++++++++-------
 .../android/usbterminal/domain/UsbUseCase.kt  | 12 +++--
 .../viewmodel/MainActivityViewModel.kt        | 19 ++++++--
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index 241fd018..f2634680 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -87,10 +87,15 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.connectIfAlreadyHasPermission(this)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.actionConnect -> {
-                viewModel.connect()
+                viewModel.connect(this)
                 true
             }
             R.id.actionDisconnect -> {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index 1df26e94..bafaa128 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -20,8 +20,9 @@ import javax.inject.Inject
 internal interface IUsbRepository {
     val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
-    fun scanForArduinoDevices(): List<UsbDevice>
-    fun requestUsbPermission(device: UsbDevice)
+    fun scanForArduinoDevices(activityContext: Context): List<UsbDevice>
+    fun requestUsbPermission(activityContext: Context, device: UsbDevice)
+    fun hasPermission(activityContext: Context, device: UsbDevice): Boolean
     fun onPermissionResult(device: UsbDevice?, granted: Boolean)
     fun disconnect()
 }
@@ -31,7 +32,7 @@ internal class UsbRepository
     private val context: Context,
     private val scope: CoroutineScope,
 ): IUsbRepository {
-    private val usbManager = context.getSystemService(UsbManager::class.java)
+//    private val usbManager = context.getSystemService(UsbManager::class.java)
 
     private val _usbDevice = MutableSharedFlow<UsbDevice?>(replay = 1)
     override val usbDevice: SharedFlow<UsbDevice?> = _usbDevice.asSharedFlow()
@@ -39,37 +40,52 @@ internal class UsbRepository
     private val _infoMessageFlow = MutableStateFlow<String>("")
     override val infoMessageFlow: SharedFlow<String> = _infoMessageFlow.asSharedFlow()
 
-    override fun scanForArduinoDevices(): List<UsbDevice> {
+    override fun scanForArduinoDevices(activityContext: Context): List<UsbDevice> {
+        val usbManager = activityContext.getSystemService(UsbManager::class.java)
         val deviceList = usbManager.deviceList
         return deviceList.values.toList()
     }
 
-    override fun requestUsbPermission(device: UsbDevice) {
+    override fun requestUsbPermission(
+        activityContext: Context,
+        device: UsbDevice
+    ) {
         val intent = Intent(Constants.ACTION_USB_PERMISSION)
         val permissionIntent = PendingIntent.getBroadcast(
-            context,
+            activityContext,
             0,
             intent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
-        scope.launch { _usbDevice.emit(device) }
         ContextCompat.registerReceiver(
-            context,
-            UsbPermissionReceiver(this),
+            activityContext,
+            UsbPermissionReceiver(this@UsbRepository),
             IntentFilter(Constants.ACTION_USB_PERMISSION),
             ContextCompat.RECEIVER_EXPORTED
         )
-        usbManager.requestPermission(device, permissionIntent)
+        scope.launch {
+            _usbDevice.emit(device)
+            val usbManager = activityContext.getSystemService(UsbManager::class.java)
+            usbManager.requestPermission(device, permissionIntent)
+        }
+    }
+
+    override fun hasPermission(activityContext: Context, device: UsbDevice): Boolean {
+        val usbManager = activityContext.getSystemService(UsbManager::class.java)
+        return usbManager.hasPermission(device)
     }
 
     override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
         scope.launch {
-            _infoMessageFlow.emit("Permission result: ${device?.vendorId}, granted: $granted\n")
-            if (granted && device != null) {
-                _usbDevice.emit(device)
-            } else {
-                _usbDevice.emit(null)
-            }
+            _infoMessageFlow.emit("" +
+                    "Permission result for device: ${device?.vendorId}, " +
+                    "granted: $granted\n")
+//            if (granted && device != null) {
+//                _usbDevice.emit(device)
+//            }
+//            else {
+//                _usbDevice.emit(null)
+//            }
         }
     }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
index 27051b65..5e255a54 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -1,5 +1,6 @@
 package org.kabiri.android.usbterminal.domain
 
+import android.content.Context
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
@@ -9,8 +10,9 @@ import javax.inject.Inject
 internal interface IUsbUseCase {
     val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
-    fun scanForUsbDevices(): List<UsbDevice>
-    fun requestPermission(device: UsbDevice)
+    fun scanForUsbDevices(activityContext: Context): List<UsbDevice>
+    fun hasPermission(activityContext: Context, device: UsbDevice): Boolean
+    fun requestPermission(activityContext: Context, device: UsbDevice)
     fun disconnect()
 }
 
@@ -22,9 +24,11 @@ internal class UsbUseCase
 
     override val infoMessageFlow: Flow<String> = usbRepository.infoMessageFlow
 
-    override fun scanForUsbDevices(): List<UsbDevice> = usbRepository.scanForArduinoDevices()
+    override fun scanForUsbDevices(activityContext: Context): List<UsbDevice> = usbRepository.scanForArduinoDevices(activityContext)
 
-    override fun requestPermission(device: UsbDevice) = usbRepository.requestUsbPermission(device)
+    override fun hasPermission(activityContext: Context, device: UsbDevice): Boolean = usbRepository.hasPermission(activityContext, device)
+
+    override fun requestPermission(activityContext: Context, device: UsbDevice) = usbRepository.requestUsbPermission(activityContext, device)
 
     override fun disconnect() = usbRepository.disconnect()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 0ceca24c..a8fe3529 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -1,5 +1,6 @@
 package org.kabiri.android.usbterminal.viewmodel
 
+import android.content.Context
 import android.hardware.usb.UsbDevice
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.lifecycle.ViewModel
@@ -9,6 +10,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -58,8 +61,8 @@ internal class MainActivityViewModel
         }
     }
 
-    fun connect() {
-        val usbDeviceList = usbUseCase.scanForUsbDevices()
+    fun connect(activityContext: Context) {
+        val usbDeviceList = usbUseCase.scanForUsbDevices(activityContext)
         if (usbDeviceList.isEmpty()) {
             _errorMessageFlow.value =
                 resourceProvider.getString(R.string.helper_error_usb_devices_not_attached)
@@ -73,21 +76,27 @@ internal class MainActivityViewModel
                 resourceProvider.getString(R.string.helper_error_connecting_anyway)
 
             // request permission for the unknown device anyways
-            return usbUseCase.requestPermission(usbDeviceList.first())
+            return usbUseCase.requestPermission(activityContext, usbDeviceList.first())
         }
         when (device.getArduinoType()) {
             OFFICIAL -> {
-                usbUseCase.requestPermission(device)
+                usbUseCase.requestPermission(activityContext, device)
             }
 
             else -> {
                 _infoMessageFlow.value =
                     resourceProvider.getString(R.string.helper_error_connecting_anyway)
-                usbUseCase.requestPermission(device)
+                usbUseCase.requestPermission(activityContext, device)
             }
         }
     }
 
+    fun connectIfAlreadyHasPermission(activityContext: Context) = viewModelScope.launch {
+        val usbDevice = usbUseCase.usbDevice.firstOrNull() ?: return@launch
+        usbUseCase.hasPermission(activityContext, usbDevice)
+        openDeviceAndPort(usbDevice)
+    }
+
     fun disconnect() {
         usbUseCase.disconnect()
         arduinoUseCase.disconnect()

From a269f7e14458e9082cf2a19e7778c31c95b806ed Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:39:11 +0200
Subject: [PATCH 104/126] refactor: create an interface for ArduinoRepository

---
 .../usbterminal/arduino/ArduinoRepository.kt  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
index 80fb7288..1e602296 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
@@ -28,30 +28,39 @@ import javax.inject.Inject
 
 private const val TAG = "ArduinoRepository"
 
+interface IArduinoRepository {
+    val messageFlow: Flow<String>
+    val infoMessageFlow: Flow<String>
+    val errorMessageFlow: Flow<String>
+    fun disconnect()
+    fun openDeviceAndPort(device: UsbDevice)
+    fun serialWrite(command: String): Boolean
+}
+
 internal class ArduinoRepository
 @Inject constructor(
     private val context: Context,
     private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
     private val arduinoSerialReceiver: ArduinoSerialReceiver,
     private val getBaudRate: IGetCustomBaudRateUseCase,
-) {
+): IArduinoRepository {
 
     private var currentBaudRate = defaultBaudRate // Default value
 
     private val _messageFlow = MutableStateFlow("")
-    val messageFlow: Flow<String>
+    override val messageFlow: Flow<String>
         get() = _messageFlow
             .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
 
     private val _infoMessageFlow = MutableStateFlow("")
-    val infoMessageFlow: Flow<String>
+    override val infoMessageFlow: Flow<String>
         get() = _infoMessageFlow
             .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
 
     private val _errorMessageFlow = MutableStateFlow("")
-    val errorMessageFlow: Flow<String>
+    override val errorMessageFlow: Flow<String>
         get() = _errorMessageFlow
             .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
@@ -64,7 +73,7 @@ internal class ArduinoRepository
         observeBaudRate()
     }
 
-    fun disconnect() {
+    override fun disconnect() {
         try {
             if (::connection.isInitialized) connection.close()
             _messageFlow.value = context.getString(R.string.helper_info_serial_connection_closed)
@@ -84,7 +93,7 @@ internal class ArduinoRepository
     /**
      * This method should be called after the permission is granted to access the Arduino via USB.
      */
-    fun openDeviceAndPort(device: UsbDevice) {
+    override fun openDeviceAndPort(device: UsbDevice) {
         try {
             // setup the device communication.
             connection = usbManager.openDevice(device)
@@ -138,7 +147,7 @@ internal class ArduinoRepository
     /**
      * Send a serial message to the connected Arduino.
      */
-    fun serialWrite(command: String): Boolean {
+    override fun serialWrite(command: String): Boolean {
         return try {
             if (::serialPort.isInitialized && command.isNotBlank()) {
                 serialPort.write(command.toByteArray())

From 9cbab87899039da086bea62c8e25e68fde5b7f98 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:46:50 +0200
Subject: [PATCH 105/126] refactor: use the IArduinoRepository

---
 .../org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
index bd942e7e..65fb18af 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
@@ -2,7 +2,7 @@ package org.kabiri.android.usbterminal.domain
 
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
-import org.kabiri.android.usbterminal.arduino.ArduinoRepository
+import org.kabiri.android.usbterminal.arduino.IArduinoRepository
 import javax.inject.Inject
 
 /**
@@ -20,7 +20,7 @@ internal interface IArduinoUseCase {
 
 internal class ArduinoUseCase
 @Inject constructor(
-    private val arduinoRepository: ArduinoRepository
+    private val arduinoRepository: IArduinoRepository
 ) : IArduinoUseCase {
     override fun openDeviceAndPort(device: UsbDevice) {
         arduinoRepository.openDeviceAndPort(device)

From c6327770d2361040a009f7e237ae17f628ebaaa1 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:52:39 +0200
Subject: [PATCH 106/126] refactor: provide coroutine scope to reuse it

---
 .../org/kabiri/android/usbterminal/di/AppModule.kt    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 2e3da59a..c61a2d2d 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -51,6 +51,11 @@ internal class AppModule {
         context: Context
     ): IResourceProvider = ResourceProvider(context)
 
+    @Singleton
+    @Provides
+    fun provideApplicationScope(): CoroutineScope =
+        CoroutineScope(SupervisorJob() + Dispatchers.Default)
+
     @Provides
     fun provideArduinoPermissionBroadcastReceiver() = ArduinoPermissionBroadcastReceiver()
 
@@ -80,20 +85,22 @@ internal class AppModule {
     @Provides
     fun provideUsbRepository(
         context: Context,
+        scope: CoroutineScope,
     ): IUsbRepository {
         return UsbRepository(
             context = context,
-            scope = CoroutineScope(Dispatchers.Default)
+            scope = scope,
         )
     }
 
+    @Singleton
     @Provides
     fun providesArduinoRepository(
         context: Context,
         arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
         arduinoSerialReceiver: ArduinoSerialReceiver,
         getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
-    ): ArduinoRepository {
+    ): IArduinoRepository {
         return ArduinoRepository(
             context = context,
             arduinoPermReceiver = arduinoPermReceiver,

From 0973cd67d213895a162f5e71ab70473cf58f19fc Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:57:40 +0200
Subject: [PATCH 107/126] refactor: improve formatting and order of imports

---
 .../android/usbterminal/viewmodel/MainActivityViewModel.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index a8fe3529..94e37978 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -10,20 +10,20 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IArduinoUseCase
+import org.kabiri.android.usbterminal.domain.IConnectIfPermissionIsGrantedUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
+import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
+import org.kabiri.android.usbterminal.model.OutputText
 import org.kabiri.android.usbterminal.util.IResourceProvider
 import org.kabiri.android.usbterminal.util.getArduinoType
 import org.kabiri.android.usbterminal.util.isCloneArduinoBoard
 import org.kabiri.android.usbterminal.util.isOfficialArduinoBoard
-import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
-import org.kabiri.android.usbterminal.model.OutputText
 import javax.inject.Inject
 
 /**

From bf49fd5f62eecb3824e762d5165fbc101fac9dff Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 11:59:32 +0200
Subject: [PATCH 108/126] refactor: remove unnecessary singleton annotation on
 ProvideArduinoRepository; clean imports

---
 .../main/java/org/kabiri/android/usbterminal/di/AppModule.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index c61a2d2d..ac90e2e2 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -13,9 +13,11 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import org.kabiri.android.usbterminal.arduino.ArduinoRepository
+import kotlinx.coroutines.SupervisorJob
 import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
+import org.kabiri.android.usbterminal.arduino.ArduinoRepository
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
+import org.kabiri.android.usbterminal.arduino.IArduinoRepository
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import org.kabiri.android.usbterminal.data.repository.USER_SETTING_PREFERENCES_NAME
@@ -93,7 +95,6 @@ internal class AppModule {
         )
     }
 
-    @Singleton
     @Provides
     fun providesArduinoRepository(
         context: Context,

From 41e43b3ec6cd24c001cd9f42effd677f46d324a2 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 19:57:10 +0200
Subject: [PATCH 109/126] refactor: remove unnecessary activity context

---
 .../android/usbterminal/MainActivity.kt       |  4 +--
 .../data/repository/UsbRepository.kt          | 34 +++++++------------
 .../android/usbterminal/domain/UsbUseCase.kt  | 13 ++++---
 .../viewmodel/MainActivityViewModel.kt        | 16 ++++-----
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index f2634680..a0d5902f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -89,13 +89,13 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.connectIfAlreadyHasPermission(this)
+        viewModel.connectIfAlreadyHasPermission()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.actionConnect -> {
-                viewModel.connect(this)
+                viewModel.connect()
                 true
             }
             R.id.actionDisconnect -> {
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index bafaa128..448e8b8f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -20,9 +20,9 @@ import javax.inject.Inject
 internal interface IUsbRepository {
     val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
-    fun scanForArduinoDevices(activityContext: Context): List<UsbDevice>
-    fun requestUsbPermission(activityContext: Context, device: UsbDevice)
-    fun hasPermission(activityContext: Context, device: UsbDevice): Boolean
+    fun scanForArduinoDevices(): List<UsbDevice>
+    fun requestUsbPermission(device: UsbDevice)
+    fun hasPermission(device: UsbDevice): Boolean
     fun onPermissionResult(device: UsbDevice?, granted: Boolean)
     fun disconnect()
 }
@@ -40,52 +40,42 @@ internal class UsbRepository
     private val _infoMessageFlow = MutableStateFlow<String>("")
     override val infoMessageFlow: SharedFlow<String> = _infoMessageFlow.asSharedFlow()
 
-    override fun scanForArduinoDevices(activityContext: Context): List<UsbDevice> {
-        val usbManager = activityContext.getSystemService(UsbManager::class.java)
+    override fun scanForArduinoDevices(): List<UsbDevice> {
+        val usbManager = context.getSystemService(UsbManager::class.java)
         val deviceList = usbManager.deviceList
         return deviceList.values.toList()
     }
 
-    override fun requestUsbPermission(
-        activityContext: Context,
-        device: UsbDevice
-    ) {
+    override fun requestUsbPermission(device: UsbDevice) {
         val intent = Intent(Constants.ACTION_USB_PERMISSION)
         val permissionIntent = PendingIntent.getBroadcast(
-            activityContext,
+            context,
             0,
             intent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
         ContextCompat.registerReceiver(
-            activityContext,
+            context,
             UsbPermissionReceiver(this@UsbRepository),
             IntentFilter(Constants.ACTION_USB_PERMISSION),
             ContextCompat.RECEIVER_EXPORTED
         )
         scope.launch {
             _usbDevice.emit(device)
-            val usbManager = activityContext.getSystemService(UsbManager::class.java)
+            val usbManager = context.getSystemService(UsbManager::class.java)
             usbManager.requestPermission(device, permissionIntent)
         }
     }
 
-    override fun hasPermission(activityContext: Context, device: UsbDevice): Boolean {
-        val usbManager = activityContext.getSystemService(UsbManager::class.java)
+    override fun hasPermission(device: UsbDevice): Boolean {
+        val usbManager = context.getSystemService(UsbManager::class.java)
         return usbManager.hasPermission(device)
     }
 
     override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
         scope.launch {
-            _infoMessageFlow.emit("" +
-                    "Permission result for device: ${device?.vendorId}, " +
+            _infoMessageFlow.emit("Permission result for device: ${device?.vendorId}, " +
                     "granted: $granted\n")
-//            if (granted && device != null) {
-//                _usbDevice.emit(device)
-//            }
-//            else {
-//                _usbDevice.emit(null)
-//            }
         }
     }
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
index 5e255a54..9ad57a49 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/UsbUseCase.kt
@@ -1,6 +1,5 @@
 package org.kabiri.android.usbterminal.domain
 
-import android.content.Context
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
@@ -10,9 +9,9 @@ import javax.inject.Inject
 internal interface IUsbUseCase {
     val usbDevice: SharedFlow<UsbDevice?>
     val infoMessageFlow: Flow<String>
-    fun scanForUsbDevices(activityContext: Context): List<UsbDevice>
-    fun hasPermission(activityContext: Context, device: UsbDevice): Boolean
-    fun requestPermission(activityContext: Context, device: UsbDevice)
+    fun scanForUsbDevices(): List<UsbDevice>
+    fun hasPermission(device: UsbDevice): Boolean
+    fun requestPermission(device: UsbDevice)
     fun disconnect()
 }
 
@@ -24,11 +23,11 @@ internal class UsbUseCase
 
     override val infoMessageFlow: Flow<String> = usbRepository.infoMessageFlow
 
-    override fun scanForUsbDevices(activityContext: Context): List<UsbDevice> = usbRepository.scanForArduinoDevices(activityContext)
+    override fun scanForUsbDevices(): List<UsbDevice> = usbRepository.scanForArduinoDevices()
 
-    override fun hasPermission(activityContext: Context, device: UsbDevice): Boolean = usbRepository.hasPermission(activityContext, device)
+    override fun hasPermission(device: UsbDevice): Boolean = usbRepository.hasPermission(device)
 
-    override fun requestPermission(activityContext: Context, device: UsbDevice) = usbRepository.requestUsbPermission(activityContext, device)
+    override fun requestPermission(device: UsbDevice) = usbRepository.requestUsbPermission(device)
 
     override fun disconnect() = usbRepository.disconnect()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 94e37978..10041c9d 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -1,6 +1,5 @@
 package org.kabiri.android.usbterminal.viewmodel
 
-import android.content.Context
 import android.hardware.usb.UsbDevice
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.lifecycle.ViewModel
@@ -16,7 +15,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IArduinoUseCase
-import org.kabiri.android.usbterminal.domain.IConnectIfPermissionIsGrantedUseCase
 import org.kabiri.android.usbterminal.domain.IUsbUseCase
 import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType.OFFICIAL
 import org.kabiri.android.usbterminal.model.OutputText
@@ -61,8 +59,8 @@ internal class MainActivityViewModel
         }
     }
 
-    fun connect(activityContext: Context) {
-        val usbDeviceList = usbUseCase.scanForUsbDevices(activityContext)
+    fun connect() {
+        val usbDeviceList = usbUseCase.scanForUsbDevices()
         if (usbDeviceList.isEmpty()) {
             _errorMessageFlow.value =
                 resourceProvider.getString(R.string.helper_error_usb_devices_not_attached)
@@ -76,24 +74,24 @@ internal class MainActivityViewModel
                 resourceProvider.getString(R.string.helper_error_connecting_anyway)
 
             // request permission for the unknown device anyways
-            return usbUseCase.requestPermission(activityContext, usbDeviceList.first())
+            return usbUseCase.requestPermission(usbDeviceList.first())
         }
         when (device.getArduinoType()) {
             OFFICIAL -> {
-                usbUseCase.requestPermission(activityContext, device)
+                usbUseCase.requestPermission(device)
             }
 
             else -> {
                 _infoMessageFlow.value =
                     resourceProvider.getString(R.string.helper_error_connecting_anyway)
-                usbUseCase.requestPermission(activityContext, device)
+                usbUseCase.requestPermission(device)
             }
         }
     }
 
-    fun connectIfAlreadyHasPermission(activityContext: Context) = viewModelScope.launch {
+    fun connectIfAlreadyHasPermission() = viewModelScope.launch {
         val usbDevice = usbUseCase.usbDevice.firstOrNull() ?: return@launch
-        usbUseCase.hasPermission(activityContext, usbDevice)
+        usbUseCase.hasPermission(usbDevice)
         openDeviceAndPort(usbDevice)
     }
 

From 9c2bbdc67de53f208694de831b8626df7b6509cc Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 19:58:02 +0200
Subject: [PATCH 110/126] refactor: update tests to match changes
 onPermissionResult without it having to update the device flow

---
 .../data/repository/UsbRepositoryTest.kt          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index 3b437660..0d01c249 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -32,6 +32,7 @@ import org.kabiri.android.usbterminal.Constants
 internal class UsbRepositoryTest {
 
     private val testDispatcher: TestDispatcher = StandardTestDispatcher()
+    private val testScope = TestScope(testDispatcher)
 
     private val mockContext: Context = mockk(relaxed = true)
     private val mockUsbManager: UsbManager = mockk(relaxed = true)
@@ -52,7 +53,7 @@ internal class UsbRepositoryTest {
 
         sut = UsbRepository(
             context = mockContext,
-            scope = TestScope(testDispatcher)
+            scope = testScope,
         )
     }
 
@@ -125,40 +126,40 @@ internal class UsbRepositoryTest {
     }
 
     @Test
-    fun `onPermissionResult updates usbDevice and emits info when granted`() = runTest(testDispatcher) {
+    fun `onPermissionResult emits info when granted`() = runTest(testDispatcher) {
         // arrange
         val fakeVendorId = 1234
         val fakeGranted = true
+        val expected = "Permission result for device: $fakeVendorId, granted: $fakeGranted\n"
         every { mockUsbDevice1.vendorId } returns fakeVendorId
-        val expected = "Permission result: $fakeVendorId, granted: $fakeGranted\n"
 
         // act
         sut.onPermissionResult(
             device = mockUsbDevice1,
             granted = fakeGranted
         )
+        advanceUntilIdle()
 
         // assert
-        assertThat(sut.usbDevice.first()).isEqualTo(mockUsbDevice1)
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
 
     @Test
-    fun `onPermissionResult clears usbDevice and emits info when denied`() = runTest(testDispatcher) {
+    fun `onPermissionResult emits info when denied`() = runTest(testDispatcher) {
         // arrange
         val fakeVendorId = 1234
         val fakeGranted = false
         every { mockUsbDevice1.vendorId } returns fakeVendorId
-        val expected = "Permission result: ${mockUsbDevice1.vendorId}, granted: $fakeGranted\n"
+        val expected = "Permission result for device: ${mockUsbDevice1.vendorId}, granted: $fakeGranted\n"
 
         // act
         sut.onPermissionResult(
             device = mockUsbDevice1,
             granted = fakeGranted
         )
+        advanceUntilIdle()
 
         // assert
-        assertThat(sut.usbDevice.first()).isNull()
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
 

From 58b0ad22844a9bdfc64c95ed6e56fdf4773a690a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 20:34:30 +0200
Subject: [PATCH 111/126] refactor: keep usb repository's emitted messages
 consistent with the old ArduinoPermissionBroadcastReceiver

---
 .../data/repository/UsbPermissionReceiver.kt  | 31 +++++++++---
 .../data/repository/UsbRepository.kt          | 49 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
index a90f6771..aea99501 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbPermissionReceiver.kt
@@ -5,17 +5,36 @@ import android.content.Context
 import android.content.Intent
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
+import android.os.Build
 import org.kabiri.android.usbterminal.Constants
 
 internal class UsbPermissionReceiver(
     private val repository: IUsbRepository,
 ) : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
-        if (intent?.action == Constants.ACTION_USB_PERMISSION) {
-            val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-            val granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
-            repository.onPermissionResult(device, granted)
-            context?.unregisterReceiver(this)
+        when (intent?.action) {
+            Constants.ACTION_USB_PERMISSION -> {
+                val device = intent.getUsbDeviceExtra()
+                val granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
+                repository.onPermissionResult(device, granted)
+                context?.unregisterReceiver(this)
+            }
+
+            UsbManager.ACTION_USB_DEVICE_ATTACHED ->
+                repository.onDeviceAttached(intent.getUsbDeviceExtra())
+
+            UsbManager.ACTION_USB_DEVICE_DETACHED ->
+                repository.onDeviceAttached(intent.getUsbDeviceExtra())
+
+            null -> repository.onUnknownAction(intent)
         }
     }
-}
\ No newline at end of file
+}
+
+private fun Intent.getUsbDeviceExtra(): UsbDevice? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        this.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
+    } else {
+        @Suppress("DEPRECATION")
+        this.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+    }
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index 448e8b8f..628ac0a9 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.Constants
+import org.kabiri.android.usbterminal.R
 import javax.inject.Inject
 
 internal interface IUsbRepository {
@@ -24,6 +25,9 @@ internal interface IUsbRepository {
     fun requestUsbPermission(device: UsbDevice)
     fun hasPermission(device: UsbDevice): Boolean
     fun onPermissionResult(device: UsbDevice?, granted: Boolean)
+    fun onDeviceAttached(device: UsbDevice?)
+    fun onDeviceDetached(device: UsbDevice?)
+    fun onUnknownAction(intent: Intent?)
     fun disconnect()
 }
 
@@ -72,10 +76,49 @@ internal class UsbRepository
         return usbManager.hasPermission(device)
     }
 
-    override fun onPermissionResult(device: UsbDevice?, granted: Boolean) {
+    override fun onPermissionResult(
+        device: UsbDevice?,
+        granted: Boolean
+    ) {
+        val deviceInfo =
+            "${device?.manufacturerName} " +
+                    "${device?.productName} " +
+                    "${device?.vendorId} " +
+                    "${device?.productId}"
         scope.launch {
-            _infoMessageFlow.emit("Permission result for device: ${device?.vendorId}, " +
-                    "granted: $granted\n")
+            if (granted) {
+                val infoMsg =
+                    "${context.getString(R.string.breceiver_info_usb_permission_granted)} " +
+                            "$deviceInfo\n"
+                _infoMessageFlow.emit("\n$infoMsg")
+            } else {
+                val error = "${context.getString(R.string.breceiver_error_usb_permission_denied)} " +
+                        "${device?.manufacturerName} ${device?.productName} " +
+                        "${device?.vendorId} ${device?.productId}"
+                _infoMessageFlow.emit(
+                    "${context.getString(R.string.breceiver_error_usb_permission_denied)} $error")
+            }
+        }
+    }
+
+    override fun onDeviceAttached(device: UsbDevice?) {
+        scope.launch {
+            val attachedMsg = context.getString(R.string.breceiver_info_device_attached)
+            _infoMessageFlow.emit(attachedMsg)
+        }
+    }
+
+    override fun onDeviceDetached(device: UsbDevice?) {
+        scope.launch {
+            val detachedMsg = context.getString(R.string.breceiver_info_device_detached)
+            _infoMessageFlow.emit(detachedMsg)
+        }
+    }
+
+    override fun onUnknownAction(intent: Intent?) {
+        scope.launch {
+            val unknownActionMsg = context.getString(R.string.breceiver_info_unknown_intent_action)
+            _infoMessageFlow.emit(unknownActionMsg)
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ba19820..3477914f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,4 +55,5 @@
     <string name="breceiver_error_usb_permission_denied">permission denied for device:\n</string>
     <string name="breceiver_info_device_attached">Device attached\n</string>
     <string name="breceiver_info_device_detached">Device detached\n</string>
+    <string name="breceiver_info_unknown_intent_action">intent.action was null\n</string>
 </resources>

From 07cd7e1ad882eae38535a05311156923a48ebd40 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 20:38:37 +0200
Subject: [PATCH 112/126] refactor: remove
 ArduinoPermissionBroadcastReceiver.kt because it is replaced with
 UsbPermissionReceiver

---
 .../ArduinoPermissionBroadcastReceiver.kt     | 88 -------------------
 .../usbterminal/arduino/ArduinoRepository.kt  |  4 -
 .../android/usbterminal/di/AppModule.kt       |  6 --
 3 files changed, 98 deletions(-)
 delete mode 100644 app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
deleted file mode 100644
index bc5f13a0..00000000
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoPermissionBroadcastReceiver.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.kabiri.android.usbterminal.arduino
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbManager
-import android.hardware.usb.UsbManager.EXTRA_DEVICE
-import android.hardware.usb.UsbManager.EXTRA_PERMISSION_GRANTED
-import android.os.Build
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import org.kabiri.android.usbterminal.Constants
-import org.kabiri.android.usbterminal.R
-import kotlin.collections.plusAssign
-
-/**
- * Created by Ali Kabiri on 13.04.20.
- *
- * Gets informed when the user has granted the app interaction with Arduino.
- */
-class ArduinoPermissionBroadcastReceiver: BroadcastReceiver() {
-
-    companion object {
-        private const val TAG = "ArduinoPermReceiver"
-    }
-
-    private val _liveOutput = MutableStateFlow("")
-    private val _liveInfoOutput = MutableStateFlow("")
-    private val _liveErrorOutput = MutableStateFlow("")
-
-    val liveOutput: StateFlow<String>
-        get() = _liveOutput
-    val liveInfoOutput: StateFlow<String>
-        get() = _liveInfoOutput
-    val liveErrorOutput: StateFlow<String>
-        get() = _liveErrorOutput
-
-    private val _liveGrantedDevice = MutableStateFlow<UsbDevice?>(null)
-    val liveGrantedDevice: StateFlow<UsbDevice?>
-        get() = _liveGrantedDevice
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        when (intent?.action) {
-            Constants.ACTION_USB_PERMISSION -> {
-                Log.i(TAG, "receiver: USB permission intent received $this")
-                val extras = intent.extras
-                _liveInfoOutput.value += "\nIntent extras: $extras"
-
-                val device: UsbDevice? = intent.getParcelableExtra(EXTRA_DEVICE)
-                val permissionGranted = intent.getBooleanExtra(EXTRA_PERMISSION_GRANTED, false)
-                if (permissionGranted) {
-                    val info = "${context?.getString(R.string.breceiver_info_usb_permission_granted)} " +
-                            "${device?.manufacturerName} ${device?.productName} " +
-                            "${device?.vendorId} ${device?.productId}"
-                    _liveInfoOutput.value += "\n$info"
-                    device?.let {
-                        _liveInfoOutput.value = "setting the device globally..."
-                        _liveGrantedDevice.value = it
-                    }
-                } else {
-                    val err = "${context?.getString(R.string.breceiver_error_usb_permission_denied)} " +
-                            "${device?.manufacturerName} ${device?.productName} " +
-                            "${device?.vendorId} ${device?.productId}"
-                    _liveErrorOutput.value =
-                        "${context?.getString(R.string.breceiver_error_usb_permission_denied)} $err"
-                }
-            }
-
-            UsbManager.ACTION_USB_DEVICE_ATTACHED -> {
-                val attachedMsg = context?.getString(R.string.breceiver_info_device_attached) ?: ""
-                _liveOutput.value = attachedMsg
-            }
-
-            UsbManager.ACTION_USB_DEVICE_DETACHED -> _liveOutput.value =
-                context?.getString(R.string.breceiver_info_device_detached) ?: ""
-
-            null -> {
-                val nullMsg = "intent.action was null"
-                _liveErrorOutput.value = nullMsg
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
index 1e602296..d3b61e3e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
@@ -40,7 +40,6 @@ interface IArduinoRepository {
 internal class ArduinoRepository
 @Inject constructor(
     private val context: Context,
-    private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
     private val arduinoSerialReceiver: ArduinoSerialReceiver,
     private val getBaudRate: IGetCustomBaudRateUseCase,
 ): IArduinoRepository {
@@ -50,19 +49,16 @@ internal class ArduinoRepository
     private val _messageFlow = MutableStateFlow("")
     override val messageFlow: Flow<String>
         get() = _messageFlow
-            .combine(arduinoPermReceiver.liveOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveOutput) { a, b -> a + b }
 
     private val _infoMessageFlow = MutableStateFlow("")
     override val infoMessageFlow: Flow<String>
         get() = _infoMessageFlow
-            .combine(arduinoPermReceiver.liveInfoOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveInfoOutput) { a, b -> a + b }
 
     private val _errorMessageFlow = MutableStateFlow("")
     override val errorMessageFlow: Flow<String>
         get() = _errorMessageFlow
-            .combine(arduinoPermReceiver.liveErrorOutput) { a, b -> a + b }
             .combine(arduinoSerialReceiver.liveErrorOutput) { a, b -> a + b }
 
     private var usbManager: UsbManager = context.getSystemService(Context.USB_SERVICE) as UsbManager
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index ac90e2e2..0be0248d 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -14,7 +14,6 @@ import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
 import org.kabiri.android.usbterminal.arduino.ArduinoRepository
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.arduino.IArduinoRepository
@@ -58,9 +57,6 @@ internal class AppModule {
     fun provideApplicationScope(): CoroutineScope =
         CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
-    @Provides
-    fun provideArduinoPermissionBroadcastReceiver() = ArduinoPermissionBroadcastReceiver()
-
     @Provides
     fun providesArduinoSerialReceiver() = ArduinoSerialReceiver()
 
@@ -98,13 +94,11 @@ internal class AppModule {
     @Provides
     fun providesArduinoRepository(
         context: Context,
-        arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
         arduinoSerialReceiver: ArduinoSerialReceiver,
         getCustomBaudRateUseCase: IGetCustomBaudRateUseCase,
     ): IArduinoRepository {
         return ArduinoRepository(
             context = context,
-            arduinoPermReceiver = arduinoPermReceiver,
             arduinoSerialReceiver = arduinoSerialReceiver,
             getBaudRate = getCustomBaudRateUseCase,
         )

From 0ee4a413b2719f856b15a25c956d0ab70ac89a1b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:05:08 +0200
Subject: [PATCH 113/126] tests: make sure onDeviceAttached, onDeviceDetached,
 and onUnknownAction emit messages as expected

---
 .../data/repository/UsbRepository.kt          | 11 ++-
 .../data/repository/UsbRepositoryTest.kt      | 69 +++++++++++++++++--
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index 628ac0a9..087a0f0f 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -89,14 +89,13 @@ internal class UsbRepository
             if (granted) {
                 val infoMsg =
                     "${context.getString(R.string.breceiver_info_usb_permission_granted)} " +
-                            "$deviceInfo\n"
+                            deviceInfo
                 _infoMessageFlow.emit("\n$infoMsg")
             } else {
-                val error = "${context.getString(R.string.breceiver_error_usb_permission_denied)} " +
-                        "${device?.manufacturerName} ${device?.productName} " +
-                        "${device?.vendorId} ${device?.productId}"
-                _infoMessageFlow.emit(
-                    "${context.getString(R.string.breceiver_error_usb_permission_denied)} $error")
+                val errorMsg =
+                    "${context.getString(R.string.breceiver_error_usb_permission_denied)} " +
+                        deviceInfo
+                _infoMessageFlow.emit(errorMsg)
             }
         }
     }
diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index 0d01c249..36bed702 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -128,10 +128,17 @@ internal class UsbRepositoryTest {
     @Test
     fun `onPermissionResult emits info when granted`() = runTest(testDispatcher) {
         // arrange
-        val fakeVendorId = 1234
         val fakeGranted = true
-        val expected = "Permission result for device: $fakeVendorId, granted: $fakeGranted\n"
-        every { mockUsbDevice1.vendorId } returns fakeVendorId
+        val fakeId = 123
+        val fakeString = "doesn't matter"
+        val fakeMsg = "permission granted"
+        val fakeDeviceInfo = "$fakeString $fakeString $fakeId $fakeId"
+        val expected = "\n$fakeMsg $fakeDeviceInfo"
+        every { mockContext.getString(any()) } returns fakeMsg
+        every { mockUsbDevice1.manufacturerName } returns fakeString
+        every { mockUsbDevice1.productName } returns fakeString
+        every { mockUsbDevice1.vendorId } returns fakeId
+        every { mockUsbDevice1.productId } returns fakeId
 
         // act
         sut.onPermissionResult(
@@ -147,10 +154,17 @@ internal class UsbRepositoryTest {
     @Test
     fun `onPermissionResult emits info when denied`() = runTest(testDispatcher) {
         // arrange
-        val fakeVendorId = 1234
         val fakeGranted = false
-        every { mockUsbDevice1.vendorId } returns fakeVendorId
-        val expected = "Permission result for device: ${mockUsbDevice1.vendorId}, granted: $fakeGranted\n"
+        val fakeId = 123
+        val fakeString = "doesn't matter"
+        val fakeMsg = "permission denied"
+        val fakeDeviceInfo = "$fakeString $fakeString $fakeId $fakeId"
+        val expected = "$fakeMsg $fakeDeviceInfo"
+        every { mockContext.getString(any()) } returns fakeMsg
+        every { mockUsbDevice1.manufacturerName } returns fakeString
+        every { mockUsbDevice1.productName } returns fakeString
+        every { mockUsbDevice1.vendorId } returns fakeId
+        every { mockUsbDevice1.productId } returns fakeId
 
         // act
         sut.onPermissionResult(
@@ -163,6 +177,49 @@ internal class UsbRepositoryTest {
         assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
     }
 
+    @Test
+    fun `onDeviceAttached emits info when granted`() = runTest(testDispatcher) {
+        // arrange
+        val expected = "fake device attached"
+        every { mockContext.getString(any()) } returns expected
+
+        // act
+        sut.onDeviceAttached(device = mockUsbDevice1)
+        advanceUntilIdle()
+
+        // assert
+        assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
+    }
+
+    @Test
+    fun `onDeviceDetached emits info when granted`() = runTest(testDispatcher) {
+        // arrange
+        val expected = "fake device detached"
+        every { mockContext.getString(any()) } returns expected
+
+        // act
+        sut.onDeviceDetached(device = mockUsbDevice1)
+        advanceUntilIdle()
+
+        // assert
+        assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
+    }
+
+    @Test
+    fun `onUnknownAction emits info when granted`() = runTest(testDispatcher) {
+        // arrange
+        val expected = "strange action received"
+        val mockIntent: Intent = mockk()
+        every { mockContext.getString(any()) } returns expected
+
+        // act
+        sut.onUnknownAction(mockIntent)
+        advanceUntilIdle()
+
+        // assert
+        assertThat(sut.infoMessageFlow.first()).isEqualTo(expected)
+    }
+
     @Test
     fun `onDisconnect clears usbDevice`() = runTest {
         // arrange

From 9a4b944faac1d7f6b418d683b06df0ae5fa2452e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:10:07 +0200
Subject: [PATCH 114/126] ci: bump ruby version

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 8d9239a6..e03a03bd 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
           bundler-cache: true
       - name: set up JDK 17
         uses: actions/setup-java@v4

From 3617f7ebb94ee1fb709eefbbbddee5766f2307e0 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:13:07 +0200
Subject: [PATCH 115/126] tests: test has permission

---
 .../data/repository/UsbRepositoryTest.kt      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
index 36bed702..da598bbf 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/data/repository/UsbRepositoryTest.kt
@@ -125,6 +125,32 @@ internal class UsbRepositoryTest {
         }
     }
 
+    @Test
+    fun `hasPermission returns true when granted`() = runTest {
+        // arrange
+        every { mockUsbManager.hasPermission(mockUsbDevice1) } returns true
+
+        // act
+        val actual = sut.hasPermission(mockUsbDevice1)
+
+        // assert
+        assertThat(actual).isTrue()
+        verify { mockUsbManager.hasPermission(mockUsbDevice1) }
+    }
+
+    @Test
+    fun `hasPermission returns false when denied`() = runTest {
+        // arrange
+        every { mockUsbManager.hasPermission(mockUsbDevice2) } returns false
+
+        // act
+        val actual = sut.hasPermission(mockUsbDevice2)
+
+        // assert
+        assertThat(actual).isFalse()
+        verify { mockUsbManager.hasPermission(mockUsbDevice2) }
+    }
+
     @Test
     fun `onPermissionResult emits info when granted`() = runTest(testDispatcher) {
         // arrange

From 7a0d50e97d61f49c5078e8b4561c2a5b5ece1bf0 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:14:41 +0200
Subject: [PATCH 116/126] nitpick: remove commented code

---
 .../kabiri/android/usbterminal/data/repository/UsbRepository.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
index 087a0f0f..c96ece86 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/UsbRepository.kt
@@ -36,7 +36,6 @@ internal class UsbRepository
     private val context: Context,
     private val scope: CoroutineScope,
 ): IUsbRepository {
-//    private val usbManager = context.getSystemService(UsbManager::class.java)
 
     private val _usbDevice = MutableSharedFlow<UsbDevice?>(replay = 1)
     override val usbDevice: SharedFlow<UsbDevice?> = _usbDevice.asSharedFlow()

From f3d0f134779de6581e180d9849f98fd02a2b95d3 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:15:56 +0200
Subject: [PATCH 117/126] nitpick: use Unit instead of empty block

---
 .../kabiri/android/usbterminal/ui/setting/SettingValueItem.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
index 96eb2524..504be20e 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingValueItem.kt
@@ -88,7 +88,7 @@ internal fun SettingValueItem(
             .padding(16.dp),
         trailingIcon = {
             when (saveState) {
-                DEFAULT -> {}
+                DEFAULT -> Unit
                 UNSAVED -> {
                     IconButton(onClick = {
                         onClickSaveNewValue()

From e77c9a5ad0bd366c4de284d44664816dd4d47543 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:16:33 +0200
Subject: [PATCH 118/126] refactor: remove unused import

---
 .../kabiri/android/usbterminal/ui/setting/SettingViewModel.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
index f62d7304..937b09b7 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/setting/SettingViewModel.kt
@@ -1,10 +1,8 @@
 package org.kabiri.android.usbterminal.ui.setting
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.domain.ISetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.model.defaultBaudRate

From 4258cbbe01ad8340d84a15a7d497ff13a53b0a8b Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:18:03 +0200
Subject: [PATCH 119/126] nitpick: change IResourceProvider to a functional
 interface

---
 .../org/kabiri/android/usbterminal/util/ResourceProvider.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt b/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
index 817c95e6..9a28ef93 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/util/ResourceProvider.kt
@@ -8,7 +8,7 @@ import javax.inject.Singleton
  * Created by Ali Kabiri on 07.05.2025.
  */
 
-interface IResourceProvider {
+fun interface IResourceProvider {
     fun getString(resId: Int): String
 }
 

From 9155c9bba55368731d3bd02f5e96c3655b597a3c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:19:59 +0200
Subject: [PATCH 120/126] tests: make sure ResourceProvider works as expected

---
 .../usbterminal/util/ResourceProviderTest.kt  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 app/src/test/java/org/kabiri/android/usbterminal/util/ResourceProviderTest.kt

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/util/ResourceProviderTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/util/ResourceProviderTest.kt
new file mode 100644
index 00000000..687912ef
--- /dev/null
+++ b/app/src/test/java/org/kabiri/android/usbterminal/util/ResourceProviderTest.kt
@@ -0,0 +1,25 @@
+package org.kabiri.android.usbterminal.util
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.Test
+
+class ResourceProviderTest {
+    private val mockContext = mockk<Context>()
+    private val sut = ResourceProvider(mockContext)
+
+    @Test
+    fun `getString delegates to context getString`() {
+        val resId = 123
+        val expected = "test string"
+        every { mockContext.getString(resId) } returns expected
+
+        val actual = sut.getString(resId)
+
+        assertThat(actual).isEqualTo(expected)
+        verify { mockContext.getString(resId) }
+    }
+}
\ No newline at end of file

From 46e1da9eef468eb88e3eaa19ce49c4beec31bae8 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:27:20 +0200
Subject: [PATCH 121/126] tests: make sure ArduinoUseCaseTest works as expected

---
 .../usbterminal/domain/ArduinoUseCaseTest.kt  | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt
new file mode 100644
index 00000000..1058eb5c
--- /dev/null
+++ b/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt
@@ -0,0 +1,93 @@
+package org.kabiri.android.usbterminal.domain
+
+import android.hardware.usb.UsbDevice
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.kabiri.android.usbterminal.arduino.IArduinoRepository
+
+internal class ArduinoUseCaseTest {
+
+    private val mockRepo = mockk<IArduinoRepository>(relaxed = true)
+    private val sut = ArduinoUseCase(mockRepo)
+
+    @Test
+    fun `openDeviceAndPort delegates to repository`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+
+        // Act
+        sut.openDeviceAndPort(device)
+
+        // Assert
+        verify { mockRepo.openDeviceAndPort(device) }
+    }
+
+    @Test
+    fun `disconnect delegates to repository`() {
+        // Arrange
+        // Act
+        sut.disconnect()
+
+        // Assert
+        verify { mockRepo.disconnect() }
+    }
+
+    @Test
+    fun `serialWrite returns repository result`() {
+        // Arrange
+        val fakeCommand = "doesn't matter"
+        every { mockRepo.serialWrite(fakeCommand) } returns true
+
+        // Act
+        val result = sut.serialWrite(fakeCommand)
+
+        // Assert
+        assertThat(result).isTrue()
+        verify { mockRepo.serialWrite(fakeCommand) }
+    }
+
+    @Test
+    fun `messageFlow emits repository messages`() = runTest {
+        // Arrange
+        val expected = listOf("m1", "m2")
+        every { mockRepo.messageFlow } returns flowOf("m1", "m2")
+
+        // Act
+        val actual = sut.messageFlow.toList()
+
+        // Assert
+        assertThat(actual).containsExactlyElementsIn(expected)
+    }
+
+    @Test
+    fun `infoMessageFlow emits repository infos`() = runTest {
+        // Arrange
+        val expected = listOf("i1", "i2")
+        every { mockRepo.infoMessageFlow } returns flowOf("i1", "i2")
+
+        // Act
+        val actual = sut.infoMessageFlow.toList()
+
+        // Assert
+        assertThat(actual).containsExactlyElementsIn(expected)
+    }
+
+    @Test
+    fun `errorMessageFlow emits repository errors`() = runTest {
+        // Arrange
+        val expected = listOf("e1", "e2")
+        every { mockRepo.errorMessageFlow } returns flowOf("e1", "e2")
+
+        // Act
+        val actual = sut.errorMessageFlow.toList()
+
+        // Assert
+        assertThat(actual).containsExactlyElementsIn(expected)
+    }
+}
\ No newline at end of file

From 32e887d84d7525f664ef210c65ee356f8103578a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:28:51 +0200
Subject: [PATCH 122/126] refactor: move ArduinoRepository to repository
 package

---
 .../{arduino => data/repository}/ArduinoRepository.kt         | 3 ++-
 .../main/java/org/kabiri/android/usbterminal/di/AppModule.kt  | 4 ++--
 .../org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt   | 2 +-
 .../kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename app/src/main/java/org/kabiri/android/usbterminal/{arduino => data/repository}/ArduinoRepository.kt (98%)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
similarity index 98%
rename from app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
index d3b61e3e..7e08d091 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.arduino
+package org.kabiri.android.usbterminal.data.repository
 
 import android.content.Context
 import android.hardware.usb.UsbDevice
@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index 0be0248d..e33033f0 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -14,9 +14,9 @@ import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import org.kabiri.android.usbterminal.arduino.ArduinoRepository
+import org.kabiri.android.usbterminal.data.repository.ArduinoRepository
 import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
-import org.kabiri.android.usbterminal.arduino.IArduinoRepository
+import org.kabiri.android.usbterminal.data.repository.IArduinoRepository
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository
 import org.kabiri.android.usbterminal.data.repository.USER_SETTING_PREFERENCES_NAME
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
index 65fb18af..cd2808d7 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/domain/ArduinoUseCase.kt
@@ -2,7 +2,7 @@ package org.kabiri.android.usbterminal.domain
 
 import android.hardware.usb.UsbDevice
 import kotlinx.coroutines.flow.Flow
-import org.kabiri.android.usbterminal.arduino.IArduinoRepository
+import org.kabiri.android.usbterminal.data.repository.IArduinoRepository
 import javax.inject.Inject
 
 /**
diff --git a/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt
index 1058eb5c..c76e86f8 100644
--- a/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt
+++ b/app/src/test/java/org/kabiri/android/usbterminal/domain/ArduinoUseCaseTest.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.kabiri.android.usbterminal.arduino.IArduinoRepository
+import org.kabiri.android.usbterminal.data.repository.IArduinoRepository
 
 internal class ArduinoUseCaseTest {
 

From e06fc23760277052097fc6999036532b937a1eb1 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:31:02 +0200
Subject: [PATCH 123/126] refactor: move ArduinoSerialReceiver to repository
 package

---
 .../android/usbterminal/data/repository/ArduinoRepository.kt    | 1 -
 .../{arduino => data/repository}/ArduinoSerialReceiver.kt       | 2 +-
 .../main/java/org/kabiri/android/usbterminal/di/AppModule.kt    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename app/src/main/java/org/kabiri/android/usbterminal/{arduino => data/repository}/ArduinoSerialReceiver.kt (96%)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
index 7e08d091..70ddf555 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt
@@ -14,7 +14,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
-import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
 import org.kabiri.android.usbterminal.model.defaultBaudRate
 import javax.inject.Inject
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoSerialReceiver.kt
similarity index 96%
rename from app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt
rename to app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoSerialReceiver.kt
index cea3438b..b745b410 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoSerialReceiver.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoSerialReceiver.kt
@@ -1,4 +1,4 @@
-package org.kabiri.android.usbterminal.arduino
+package org.kabiri.android.usbterminal.data.repository
 
 import android.util.Log
 import com.felhr.usbserial.UsbSerialInterface
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
index e33033f0..766af909 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import org.kabiri.android.usbterminal.data.repository.ArduinoRepository
-import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
+import org.kabiri.android.usbterminal.data.repository.ArduinoSerialReceiver
 import org.kabiri.android.usbterminal.data.repository.IArduinoRepository
 import org.kabiri.android.usbterminal.data.repository.IUsbRepository
 import org.kabiri.android.usbterminal.data.repository.IUserSettingRepository

From 063a264e89884370584883f66f9fa7cbd0659224 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:44:35 +0200
Subject: [PATCH 124/126] tests: make sure UsbUseCase works as expected

---
 .../usbterminal/domain/UsbUseCaseTest.kt      | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 app/src/test/java/org/kabiri/android/usbterminal/domain/UsbUseCaseTest.kt

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/domain/UsbUseCaseTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/domain/UsbUseCaseTest.kt
new file mode 100644
index 00000000..d5f573c1
--- /dev/null
+++ b/app/src/test/java/org/kabiri/android/usbterminal/domain/UsbUseCaseTest.kt
@@ -0,0 +1,110 @@
+package org.kabiri.android.usbterminal.domain
+
+import android.hardware.usb.UsbDevice
+import com.google.common.truth.Truth.assertThat
+import io.mockk.clearAllMocks
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.MutableSharedFlow
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.kabiri.android.usbterminal.data.repository.IUsbRepository
+
+internal class UsbUseCaseTest {
+
+    private val mockRepo = mockk<IUsbRepository>(relaxed = true)
+    private lateinit var sut: UsbUseCase
+
+    @Before
+    fun setUp() {
+        sut = UsbUseCase(mockRepo)
+    }
+
+    @After
+    fun cleanUp() {
+        clearAllMocks()
+    }
+
+    @Test
+    fun `usbDevice delegates to repository`() {
+        // Arrange
+        val expected = MutableSharedFlow<UsbDevice?>()
+        every { mockRepo.usbDevice } returns expected
+        sut = UsbUseCase(mockRepo) // Reinitialize with new mock repo
+
+        // Act
+        val actual = sut.usbDevice
+
+        assertThat(actual).isSameInstanceAs(expected)
+        verify { mockRepo.usbDevice }
+    }
+
+    @Test
+    fun `infoMessageFlow delegates to repository`() {
+        // Arrange
+        val expected = MutableSharedFlow<String>()
+        every { mockRepo.infoMessageFlow } returns expected
+        sut = UsbUseCase(mockRepo) // Reinitialize with new mock repo
+
+        // Act
+        val actual = sut.infoMessageFlow
+
+        // Assert
+        assertThat(actual).isSameInstanceAs(expected)
+        verify { mockRepo.infoMessageFlow }
+    }
+
+    @Test
+    fun `scanForUsbDevices delegates to repository`() {
+        // Arrange
+        val device1 = mockk<UsbDevice>()
+        val device2 = mockk<UsbDevice>()
+        val expected = listOf(device1, device2)
+        every { mockRepo.scanForArduinoDevices() } returns expected
+
+        // Act
+        val actual = sut.scanForUsbDevices()
+
+        // Assert
+        assertThat(actual).containsExactlyElementsIn(expected)
+        verify { mockRepo.scanForArduinoDevices() }
+    }
+
+    @Test
+    fun `hasPermission delegates to repository`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+        every { mockRepo.hasPermission(device) } returns true
+
+        // Act
+        val result = sut.hasPermission(device)
+
+        // Assert
+        assertThat(result).isTrue()
+        verify { mockRepo.hasPermission(device) }
+    }
+
+    @Test
+    fun `requestPermission delegates to repository`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+
+        // Act
+        sut.requestPermission(device)
+
+        // Assert
+        verify { mockRepo.requestUsbPermission(device) }
+    }
+
+    @Test
+    fun `disconnect delegates to repository`() {
+        // Arrange
+        // Act
+        sut.disconnect()
+
+        // Assert
+        verify { mockRepo.disconnect() }
+    }
+}
\ No newline at end of file

From de88407bd3006174d2a117245112cb529960d00e Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 21:56:45 +0200
Subject: [PATCH 125/126] tests: make sure ArduinoDevice type gets detected as
 expected

---
 .../usbterminal/model/ArduinoDeviceTest.kt    | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 app/src/test/java/org/kabiri/android/usbterminal/model/ArduinoDeviceTest.kt

diff --git a/app/src/test/java/org/kabiri/android/usbterminal/model/ArduinoDeviceTest.kt b/app/src/test/java/org/kabiri/android/usbterminal/model/ArduinoDeviceTest.kt
new file mode 100644
index 00000000..6e104aeb
--- /dev/null
+++ b/app/src/test/java/org/kabiri/android/usbterminal/model/ArduinoDeviceTest.kt
@@ -0,0 +1,75 @@
+package org.kabiri.android.usbterminal.model
+
+import android.hardware.usb.UsbDevice
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.kabiri.android.usbterminal.model.ArduinoDevice.ArduinoType
+import org.kabiri.android.usbterminal.util.isCloneArduinoBoard
+import org.kabiri.android.usbterminal.util.isOfficialArduinoBoard
+
+class ArduinoDeviceTest {
+
+    @Before
+    fun setUp() {
+        mockkStatic(
+            UsbDevice::isOfficialArduinoBoard,
+            UsbDevice::isCloneArduinoBoard
+        )
+    }
+
+    @After
+    fun tearDown() {
+        unmockkStatic(
+            UsbDevice::isOfficialArduinoBoard,
+            UsbDevice::isCloneArduinoBoard
+        )
+    }
+
+    @Test
+    fun `type is OFFICIAL when isOfficialArduinoBoard returns true`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+        every { device.isOfficialArduinoBoard() } returns true
+        every { device.isCloneArduinoBoard() } returns false
+
+        // Act
+        val sut = ArduinoDevice(device)
+
+        // Assert
+        assertThat(sut.type).isEqualTo(ArduinoType.OFFICIAL)
+    }
+
+    @Test
+    fun `type is CLONE when isCloneArduinoBoard returns true`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+        every { device.isOfficialArduinoBoard() } returns false
+        every { device.isCloneArduinoBoard() } returns true
+
+        // Act
+        val sut = ArduinoDevice(device)
+
+        // Assert
+        assertThat(sut.type).isEqualTo(ArduinoType.CLONE)
+    }
+
+    @Test
+    fun `type is UNKNOWN when both extensions return false`() {
+        // Arrange
+        val device = mockk<UsbDevice>()
+        every { device.isOfficialArduinoBoard() } returns false
+        every { device.isCloneArduinoBoard() } returns false
+
+        // Act
+        val sut = ArduinoDevice(device)
+
+        // Assert
+        assertThat(sut.type).isEqualTo(ArduinoType.UNKNOWN)
+    }
+}
\ No newline at end of file

From e906678229d91b25e69d5885ae6cc5309fa07e02 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 25 May 2025 22:08:38 +0200
Subject: [PATCH 126/126] ci: use layout for accessing project dir and build
 dir

---
 app/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b9b6f881..5ebd0cf9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -110,12 +110,12 @@ tasks.register<JacocoReport>("jacocoTestReport") {
     }
 
     val fileFilter = listOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
-    val debugTree = fileTree("${buildDir}/tmp/kotlin-classes/debug") { exclude(fileFilter) }
-    val mainSrc = "${project.projectDir}/src/main/kotlin"
+    val debugTree = fileTree("${layout.buildDirectory}/tmp/kotlin-classes/debug") { exclude(fileFilter) }
+    val mainSrc = "${layout.projectDirectory}/src/main/kotlin"
 
     sourceDirectories.from(files(setOf(mainSrc)))
     classDirectories.from(files(setOf(debugTree)))
-    executionData.from(fileTree(buildDir) { include(setOf(
+    executionData.from(fileTree(layout.buildDirectory) { include(setOf(
             "outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec",
             "outputs/managed_device_code_coverage/pixel2api30/coverage.ec"
     ))})