Update the P2P data UI and workflow

.github/workflows/ci.yml

@@ -10,7 +10,10 @@ on:
 
 jobs:
   unit_tests:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [ 30 ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11
@@ -21,9 +24,34 @@ jobs:
         run: chmod +x gradlew
       - name: Spotless check p2p-lib module
         run: ./gradlew p2p-lib:spotlessCheck
-      - name: Run unit tests with Gradle
-        run: ./gradlew p2p-lib:clean p2p-lib:jacocoTestReport --stacktrace
-      - name: Upload coverage to Coveralls with Gradle
-        run: ./gradlew p2p-lib:coveralls --stacktrace
+      - name: Load AVD cache
+        uses: actions/cache@v2
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+#          working-directory: android
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+      - name: Run unit and instrumentation tests and generate coverage report
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+#          working-directory: android
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: true
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew p2p-lib:clean p2p-lib:jacocoTestReport p2p-lib:coveralls --stacktrace
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

build.gradle

@@ -5,6 +5,7 @@ buildscript {
 
     versions.kotlin_coveralls = '2.12.0'
     versions.jacoco_tool = '0.8.7'
+    ext.composeVersion = "1.2.1"
 
     deps.kotlin_coveralls_plugin = "gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:$versions.kotlin_coveralls"
 
@@ -15,9 +16,9 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.6.10"
+        classpath "com.android.tools.build:gradle:7.1.3"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.7.10"
         classpath deps.kotlin_coveralls_plugin
         classpath deps.spotless
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 16 16:10:20 SAST 2021
+#Wed Nov 02 07:33:43 EAT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

p2p-lib/build.gradle

@@ -14,7 +14,7 @@ jacoco {
 }
 
 android {
-    compileSdk 30
+    compileSdk 32
 
     defaultConfig {
         minSdk 21
@@ -49,8 +49,12 @@ android {
         jvmTarget = '1.8'
     }
     buildFeatures {
+        compose true
         viewBinding true
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.3.0'
+    }
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
         animationsDisabled true
@@ -82,6 +86,20 @@ dependencies { configuration ->
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'androidx.activity:activity:1.3.1'
 
+    //Configure Jetpack Compose and navigation
+    api("androidx.compose.ui:ui:$composeVersion")
+    api("androidx.compose.ui:ui-tooling:$composeVersion")
+    api("androidx.compose.foundation:foundation:$composeVersion")
+    api("androidx.compose.material:material:$composeVersion")
+    api("androidx.compose.material:material-icons-core:$composeVersion")
+    api("androidx.compose.material:material-icons-extended:$composeVersion")
+    api("androidx.compose.runtime:runtime-livedata:$composeVersion")
+    api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
+    api("androidx.paging:paging-compose:1.0.0-alpha15")
+    api("androidx.activity:activity-compose:1.5.1")
+    api ("com.google.accompanist:accompanist-flowlayout:0.23.1")
+    api("androidx.work:work-runtime-ktx:2.7.1")
+
     roomDependencies(configuration)
     locationDependencies(configuration)
 
@@ -100,6 +118,11 @@ dependencies { configuration ->
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    // Compose UI test dependencies
+    testImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
 }
 
 def roomDependencies(configuration) {
@@ -118,7 +141,9 @@ def locationDependencies(configuration) {
     configuration.implementation 'com.google.android.gms:play-services-location:16.0.0'
 }
 
-task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest'/*, 'createDebugCoverageReport'*/]) {
+task jacocoTestReport(type: JacocoReport, dependsOn: [
+        'testDebugUnitTest',
+        'connectedDebugAndroidTest'/*, 'createDebugCoverageReport'*/]) {
 
     reports {
         xml.enabled = true
@@ -162,7 +187,8 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest'/*, 'cr
     classDirectories.setFrom(files([javaDebugTree, kotlinDebugTree]))
 
     executionData.setFrom(fileTree(dir: project.buildDir, includes: [
-            'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec',
+            'jacoco/testDebugUnitTest.exec',
+            'outputs/code_coverage/debugAndroidTest/connected/**/*.ec',
             'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
     ]))
 }
@@ -197,7 +223,7 @@ afterEvaluate {
                 from(components["release"])
                 artifactId = "p2p-lib"
                 groupId = "org.smartregister"
-                version = "0.5.0-SNAPSHOT"
+                version = "0.6.0-SNAPSHOT"
                 pom {
                     name.set("Peer to Peer Library")
                 }

p2p-lib/src/androidTest/java/org/smartregister/p2p/ExampleInstrumentedTest.kt

@@ -32,6 +32,6 @@ class ExampleInstrumentedTest {
   fun useAppContext() {
     // Context of the app under test.
     val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("org.smartregister.p2p", appContext.packageName)
+    assertEquals("org.smartregister.p2p.test", appContext.packageName)
   }
 }

p2p-lib/src/androidTest/java/org/smartregister/p2p/search/ui/p2p/BottomSheetScreenTest.kt

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2022 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.smartregister.p2p.search.ui.p2p
+
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import org.junit.Rule
+import org.junit.Test
+import org.smartregister.p2p.authentication.model.DeviceRole
+import org.smartregister.p2p.model.P2PState
+import org.smartregister.p2p.search.ui.p2p.components.CIRCULAR_PROGRESS_INDICATOR_TEST_TAG
+
+class BottomSheetScreenTest {
+  @get:Rule val composeRule = createComposeRule()
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForSenderDevice() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.SENDER,
+        p2PState = P2PState.RECEIVING_DATA
+      )
+    }
+
+    composeRule.onNodeWithText("Searching for nearby recipient").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Searching nearby device as").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+    composeRule.onNodeWithTag(P2P_BOTTOM_SHEET_LIST).assertExists()
+  }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForReceiverDevice() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.RECEIVER,
+        p2PState = P2PState.RECEIVING_DATA
+      )
+    }
+
+    composeRule.onNodeWithText("Waiting to pair...").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithText("Waiting to be paired with sender as")
+      .assertExists()
+      .assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+  }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForCompleteTransferStatus() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.RECEIVER,
+        p2PState = P2PState.TRANSFER_COMPLETE
+      )
+    }
+
+    composeRule.onNodeWithText("OKay").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Send Data").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Device data successfully sent").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_BUTTON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+  }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForPairDevicesFoundStatus() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.SENDER,
+        p2PState = P2PState.PAIR_DEVICES_FOUND
+      )
+    }
+
+    composeRule
+      .onNodeWithTag(CIRCULAR_PROGRESS_INDICATOR_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+  }
+}