Merge branch 'develop' into dependabot/gradle/com.android.application-8.11.1

Author: superus8r

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   codecov: codecov/codecov@5.4.3
-  ruby: circleci/ruby@2.0.0
+  ruby: circleci/ruby@2.5.3
 
 commands:
   restore_gradle_cache:
@@ -10,10 +10,11 @@ commands:
           key: v1-gradle-wrapper-{{ arch }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
       - restore_cache:
           key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle.kts" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}-{{ checksum "gradle/libs.versions.toml" }}
+
   restore_bundler_cache:
     steps:
       - restore_cache:
-          key: v1-bundler-cache-{{ checksum "Gemfile.lock" }}
+          key: v1-bundler-cache-{{ arch }}-{{ checksum "Gemfile.lock" }}
 
   save_gradle_cache:
     steps:
@@ -25,41 +26,46 @@ commands:
           paths:
             - ~/.gradle/caches
           key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle.kts" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}-{{ checksum "gradle/libs.versions.toml" }}
+
   save_bundler_cache:
     steps:
       - save_cache:
           paths:
             - vendor/bundle
           key: v1-bundler-cache-{{ checksum "Gemfile.lock" }}
 
+  setup_android:
+    steps:
+      - checkout
+      - restore_gradle_cache
+      - restore_bundler_cache
+
 executors:
   android-machine:
     machine:
-      image: android:2024.01.1
+      image: android:2024.11.1
   android-docker:
     docker:
-      - image: cimg/android:2024.01
+      - image: cimg/android:2025.04
 
 jobs:
   android-test:
     executor: android-machine
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
-      - restore_bundler_cache
+      - setup_android
       - ruby/install-deps:
           with-cache: true
       - run:
           name: Fastlane - run all tests with coverage report
           command: |
             bundle exec fastlane testDev
-            bundle exec fastlane lint
+      - run: ./gradlew lintDebug
       - save_gradle_cache
       - save_bundler_cache
       - run:
           name: Analyze on SonarCloud
-          command: ./gradlew lintDebug sonar
+          command: ./gradlew sonar
       - codecov/upload:
           files: app/build/mergedReportDir/jacocoTestReport/jacocoTestReport.xml
       - store_test_results:
@@ -71,14 +77,15 @@ jobs:
     executor: android-docker
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
+      - setup_android
       - run:
           name: Prepare Fastlane
           command: sudo bundle update
       - run:
           name: Distribute to Firebase AppTester Dev
           command: bundle exec fastlane distDev
+      - save_gradle_cache
+      - save_bundler_cache
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/apk/debug/app-debug.apk
           destination: fastlane-output-debug
@@ -87,8 +94,7 @@ jobs:
     executor: android-docker
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
+      - setup_android
       - run:
           name: Prepare Fastlane
           command: sudo bundle update
@@ -98,6 +104,8 @@ jobs:
       - run:
           name: Distribute to Firebase AppTester Prod
           command: bundle exec fastlane distProd
+      - save_gradle_cache
+      - save_bundler_cache
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
           destination: fastlane-output-release
@@ -108,4 +116,7 @@ workflows:
       - android-test:
           context: SonarCloud
       - distribute-dev
-      - distribute-internal-testing
+      - distribute-internal-testing:
+          requires:
+            - android-test
+

Gemfile.lock

@@ -10,8 +10,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1125.0)
-    aws-sdk-core (3.226.2)
+    aws-partitions (1.1131.0)
+    aws-sdk-core (3.226.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -21,7 +21,7 @@ GEM
     aws-sdk-kms (1.106.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.192.0)
+    aws-sdk-s3 (1.193.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -164,13 +164,13 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.13.0)
     jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)

app/build.gradle.kts

@@ -1,5 +1,6 @@
 import java.io.FileInputStream
-import java.util.*
+import java.util.Base64
+import java.util.Properties
 
 plugins {
     id("com.android.application")
@@ -110,6 +111,35 @@ tasks.register<JacocoReport>("jacocoTestReport") {
         csv.required.set(false)
     }
 
+    val fileFilter = listOf(
+        "**/R.class",
+        "**/MainActivity.*",
+        "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*",
+        "**/*Test*.*", "android/**/*.*",
+        "**/Dagger*.*", "**/*_Hilt*.*", "**/*Hilt*.*",
+    )
+    val kotlinDebugTree = fileTree(layout.buildDirectory.dir("tmp/kotlin-classes/debug")) { exclude(fileFilter) }
+    val mainKotlinSrc = layout.projectDirectory.dir("src/main/kotlin")
+    sourceDirectories.from(files(mainKotlinSrc))
+    classDirectories.from(files(kotlinDebugTree))
+    executionData.from(fileTree(layout.buildDirectory) {
+        include(
+            "outputs/managed_device_code_coverage/**/*.ec",
+            "outputs/unit_test_code_coverage/**/*.exec",
+        )
+    })
+}
+
+tasks.register<JacocoReport>("jacocoUiOnly") {
+
+    dependsOn("pixel2api30DebugAndroidTest")
+
+    reports {
+        xml.required.set(true)
+        html.required.set(true)
+        csv.required.set(false)
+    }
+
     val fileFilter = listOf(
         "**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*",
         "**/*Test*.*", "android/**/*.*",
@@ -123,7 +153,6 @@ tasks.register<JacocoReport>("jacocoTestReport") {
     classDirectories.from(files(javaDebugTree, kotlinDebugTree))
     executionData.from(fileTree(layout.buildDirectory) {
         include(
-            "outputs/unit_test_code_coverage/**/*.exec",
             "outputs/managed_device_code_coverage/**/*.ec",
             "outputs/managed_device_code_coverage/**/*.exec"
         )
@@ -224,7 +253,6 @@ dependencies {
 
     // Firebase
     implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics.ktx)
     implementation(libs.firebase.crashlytics.ktx)
 
     // Dependency Injection

app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityAndroidTest.kt

@@ -15,17 +15,15 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 internal class MainActivityAndroidTest {
-
     @get:Rule
     var rule = activityScenarioRule<MainActivity>()
 
     private fun ensureMenuIsAccessible(
         menuItemId: Int,
         onVisible: () -> Unit,
-        onOverflow: () -> Unit
+        onOverflow: () -> Unit,
     ) {
         try {
             // Try to find the menu item first
@@ -49,57 +47,53 @@ internal class MainActivityAndroidTest {
     }
 
     @Test
-    fun checkActionMenuItemSettingsIsDisplayed() = ensureMenuIsAccessible(
-        menuItemId = R.id.actionSettings,
-        onVisible = {
-
-            // assert
-            onView(withId(R.id.actionSettings)).check(matches(isDisplayed()))
-        },
-        onOverflow = {
-
-            // assert
-            onView(withText(R.string.title_settings)).check(matches(isDisplayed()))
-        }
-    )
+    fun checkActionMenuItemSettingsIsDisplayed() =
+        ensureMenuIsAccessible(
+            menuItemId = R.id.actionSettings,
+            onVisible = {
+                // assert
+                onView(withId(R.id.actionSettings)).check(matches(isDisplayed()))
+            },
+            onOverflow = {
+                // assert
+                onView(withText(R.string.title_settings)).check(matches(isDisplayed()))
+            },
+        )
 
     @Test
-    fun checkActionMenuItemConnectIsDisplayed() = ensureMenuIsAccessible(
-        menuItemId = R.id.actionSettings,
-        onVisible = {
-
-            // assert
-            onView(withId(R.id.actionConnect)).check(matches(isDisplayed()))
-        },
-        onOverflow = {
-
-            // assert
-            onView(withText(R.string.title_connect)).check(matches(isDisplayed()))
-        }
-    )
+    fun checkActionMenuItemConnectIsDisplayed() =
+        ensureMenuIsAccessible(
+            menuItemId = R.id.actionSettings,
+            onVisible = {
+                // assert
+                onView(withId(R.id.actionConnect)).check(matches(isDisplayed()))
+            },
+            onOverflow = {
+                // assert
+                onView(withText(R.string.title_connect)).check(matches(isDisplayed()))
+            },
+        )
 
     @Test
-    fun checkActionMenuItemDisconnectIsDisplayed() = ensureMenuIsAccessible(
-        menuItemId = R.id.actionSettings,
-        onVisible = {
-
-            // assert
-            onView(withId(R.id.actionDisconnect)).check(matches(isDisplayed()))
-        },
-        onOverflow = {
-
-            // assert
-            onView(withText(R.string.title_disconnect)).check(matches(isDisplayed()))
-        }
-    )
+    fun checkActionMenuItemDisconnectIsDisplayed() =
+        ensureMenuIsAccessible(
+            menuItemId = R.id.actionSettings,
+            onVisible = {
+                // assert
+                onView(withId(R.id.actionDisconnect)).check(matches(isDisplayed()))
+            },
+            onOverflow = {
+                // assert
+                onView(withText(R.string.title_disconnect)).check(matches(isDisplayed()))
+            },
+        )
 
     @Test
     fun clickingSettingsOpensSettingsBottomSheet() {
         // arrange
         ensureMenuIsAccessible(
             menuItemId = R.id.actionSettings,
             onVisible = {
-
                 // act
                 onView(withId(R.id.actionSettings)).perform(click())
 
@@ -112,7 +106,7 @@ internal class MainActivityAndroidTest {
 
                 // assert
                 onView(withId(R.id.composeViewSettingContent)).check(matches(isDisplayed()))
-            }
+            },
         )
     }
 }

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

@@ -19,23 +19,21 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
-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.util.scrollToLastLine
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
 
+private const val TAG = "MainActivity"
+
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-
-    companion object {
-        private const val TAG = "MainActivity"
-    }
-
     private val viewModel by viewModels<MainActivityViewModel>()
     private val settingViewModel by viewModels<SettingViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        viewModel.startObservingUsbDevice()
         setContentView(R.layout.activity_main)
 
         // avoid system navbar or soft keyboard overlapping the content.
@@ -67,9 +65,11 @@ class MainActivity : AppCompatActivity() {
         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")
+            if (viewModel.serialWrite(input)) {
+                etInput.setText("")
+            } else {
+                Log.e(TAG, "The message was not sent to Arduino")
+            }
         }
 
         // send the command to device when the button is clicked.
@@ -83,7 +83,9 @@ class MainActivity : AppCompatActivity() {
                         event.action == KeyEvent.ACTION_DOWN)) {
                 sendCommand()
                 true
-            } else false
+            } else {
+                false
+            }
         }
     }