Merge pull request #22 from superus8r/develop

Prepare release 0.9.12

Author: superus8r

.github/workflows/android.yml

@@ -7,11 +7,12 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: set up Ruby to install fastlane
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.0'
+        bundler-cache: true
+
     - name: set up JDK 11
       uses: actions/setup-java@v1
       with:

.idea/androidTestResultsUserPreferences.xml

@@ -211,7 +211,9 @@ GEM
 
 PLATFORMS
   universal-darwin-21
+  universal-darwin-22
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   fastlane

Gemfile.lock

@@ -22,8 +22,8 @@ android {
         applicationId "org.kabiri.android.usbterminal"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 10
-        versionName "0.8.0"
+        versionCode 13
+        versionName "0.9.12"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -64,7 +64,7 @@ private void loadKeyStore(Properties ksProp) {
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
@@ -79,7 +79,7 @@ dependencies {
 
     // Coroutines
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.6.0'
+    implementation 'androidx.activity:activity-compose:1.6.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
@@ -96,15 +96,15 @@ dependencies {
     testImplementation "com.google.truth:truth:1.1.3"
 
     // instrumented test libs
-    androidTestImplementation 'androidx.test:core:1.5.0-alpha02'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
     // Espresso
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     // Hamcrest for view matching
     androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
+    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.

app/build.gradle

@@ -13,6 +13,7 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
+import org.kabiri.android.usbterminal.extensions.scrollToLastLine
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
 
 @AndroidEntryPoint
@@ -51,7 +52,10 @@ class MainActivity : AppCompatActivity() {
         }
 
         viewModel.output.observe(this) {
-            tvOutput.apply { text = it }
+            tvOutput.apply {
+                text = it
+                scrollToLastLine()
+            }
         }
 
         // send the command to device when the button is clicked.

app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt

@@ -77,14 +77,14 @@ class ArduinoHelper
                     R.string.helper_error_connection_not_ready_to_close
                 )
             )
-            _liveErrorOutput.postValue(e.message)
+            _liveErrorOutput.postValue("${e.localizedMessage}\n")
         } catch (e: Exception) {
             _liveErrorOutput.postValue(
                 context.getString(
                     R.string.helper_error_connection_failed_to_close
                 )
             )
-            _liveErrorOutput.postValue(e.message)
+            _liveErrorOutput.postValue("${e.localizedMessage}\n")
         }
     }
 
@@ -93,7 +93,8 @@ class ArduinoHelper
             context,
             0,
             Intent(Constants.ACTION_USB_PERMISSION),
-            PendingIntent.FLAG_MUTABLE // it is necessary for connecting to the device.
+            // it is necessary for connecting to the device.
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
         val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
         context.registerReceiver(arduinoPermReceiver, filter) // register the broadcast receiver
@@ -118,6 +119,14 @@ class ArduinoHelper
         } catch (e: IllegalStateException) {
             Log.e(TAG, "${e.message}")
             _liveErrorOutput.postValue(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))
+        } catch (e: Exception) {
+            Log.e(TAG, "${e.message}")
+            _liveErrorOutput.postValue(context.getString(
+                R.string.helper_error_connection_failed_to_open_unknown))
         }
 
         if (::serialPort.isInitialized)
@@ -164,7 +173,9 @@ class ArduinoHelper
                 false
             }
         } catch (e: Exception) {
-            _liveErrorOutput.postValue("${context.getString(R.string.helper_error_write_problem)} ${e.localizedMessage}")
+            _liveErrorOutput.postValue(
+                context.getString(R.string.helper_error_write_problem) +
+                    " \n${e.localizedMessage}\n")
             Log.e(TAG, "$e")
             false
         }

app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt

@@ -0,0 +1,24 @@
+package org.kabiri.android.usbterminal.extensions
+
+import android.util.Log
+import android.widget.TextView
+
+/**
+ * Scroll the text view to last visible line.
+ */
+
+private const val TAG = "TextViewExtensions"
+
+fun TextView.scrollToLastLine() {
+    try {
+        if (this.text.isNotBlank()) {
+            // find internal layout for the position of the final line and subtract the height
+            val scrollAmount = this.layout.getLineTop(this.lineCount) - this.height
+            // if no need scroll needed, scrollAmount will be <=0
+            if (scrollAmount > 0) this.scrollTo(0, scrollAmount)
+            else this.scrollTo(0, 0)
+        }
+    } catch (e: Exception) {
+        Log.w(TAG, "Something went wrong when trying to autoscroll the output:\n${e.message}")
+    }
+}

app/src/main/java/org/kabiri/android/usbterminal/extensions/TextViewExtensions.kt

@@ -20,21 +20,23 @@
 
     <!-- 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">\nArduino Device not found (or the device might be a clone).</string>
-    <string name="helper_error_connecting_anyway">\nConnecting anyway (may misbehave)…</string>
-    <string name="helper_error_usb_devices_not_attached">\nNo USB devices are attached</string>
-    <string name="helper_error_serial_connection_not_opened">\nPort not opened - There might be a problem with the serial connection to Arduino</string>
-    <string name="helper_error_write_problem">Serial Write encountered an error:</string>
-    <string name="helper_error_connection_closed_unexpectedly">Device connection was closed unexpectedly</string>
-    <string name="helper_error_connection_not_ready_to_close">No device connection to close</string>
-    <string name="helper_error_connection_failed_to_close">Device connection failed to close</string>
-    <string name="helper_info_serial_connection_opened">\nSerial Connection Opened</string>
-    <string name="helper_info_serial_connection_closed">\nSerial Connection Closed</string>
-    <string name="helper_info_usb_permission_requested">Requested permission to access the USB device…</string>
-    <string name="helper_info_checking_attached_usb_devices">\nChecking attached USB devices…</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_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>
+    <string name="helper_error_write_problem">Serial Write encountered an error:\n</string>
+    <string name="helper_error_connection_closed_unexpectedly">Device connection was closed unexpectedly\n</string>
+    <string name="helper_error_connection_failed_to_open">Failed to open device connection. Please make sure the device is connected and the USB cable and the port are healthy.\n</string>
+    <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_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="breceiver_info_usb_permission_granted">"\nPermission granted for: "</string>
-    <string name="breceiver_error_usb_permission_denied">\npermission denied for device:</string>
-    <string name="breceiver_info_device_attached">\nDevice attached</string>
-    <string name="breceiver_info_device_detached">\nDevice detached</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>
+    <string name="breceiver_info_device_attached">Device attached\n</string>
+    <string name="breceiver_info_device_detached">Device detached\n</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.4.0-rc01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'

build.gradle

@@ -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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip