feat: Update sample app UI to compose (#116)

Author: FelipeCoro

.github/workflows/dependabot-automerge.yml

@@ -9,49 +9,4 @@ on:
 jobs:
   automerge-dependabot:
     name: "Automerge Dependabot PR"
-    if: >
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.actor == 'dependabot[bot]'
-    env:
-      GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
-      GIT_AUTHOR_NAME: mparticle-automation
-      GIT_AUTHOR_EMAIL: developers@mparticle.com
-      GIT_COMMITTER_NAME: mparticle-automation
-      GIT_COMMITTER_EMAIL: developers@mparticle.com
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Download artifact'
-        uses: actions/github-script@v3.1.0
-        with:
-          script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{ github.event.workflow_run.id }},
-            });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "pr"
-            })[0];
-            var download = await github.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
-      - run: unzip pr.zip
-      - name: 'Automerge PR'
-        uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            var fs = require('fs');
-            var issue_number = Number(fs.readFileSync('./NR'));
-            await github.pulls.merge({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: issue_number,
-              merge_method: 'rebase'
-            });
+    uses: mParticle/mparticle-workflows/.github/workflows/dependabot-automerge.yml@main

.github/workflows/pull-request-app-checks.yml

@@ -13,7 +13,7 @@ jobs:
 
   confirm-folder-changes:
     name: "Confirm changes in sample app folder"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout Sample Apps"
         uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
   instrumented-tests:
     name: "Instrumented Tests"
     timeout-minutes: 30
-    runs-on: macos-11
+    runs-on: macos-latest
     needs: confirm-folder-changes
     steps:
       - name: "Checkout Branch"
@@ -63,7 +63,7 @@ jobs:
   unit-tests:
     name: "Unit Tests"
     timeout-minutes: 15
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: confirm-folder-changes
     steps:
       - name: "Checkout Branch"
@@ -88,7 +88,7 @@ jobs:
   lint-checks:
     name: "Lint Checks"
     timeout-minutes: 15
-    runs-on: macos-11
+    runs-on: macos-latest
     needs: confirm-folder-changes
     steps:
       - name: "Checkout Branch"
@@ -113,7 +113,7 @@ jobs:
   kotlin-lint-checks:
     name: "Kotlin Lint Checks"
     timeout-minutes: 15
-    runs-on: macos-11
+    runs-on: macos-latest
     needs: confirm-folder-changes
     steps:
       - name: "Checkout Branch"

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
 
   create-release-branch:
     name: "Create Release Branch"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: confirm-public-repo-main-branch
     env:
       GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
@@ -47,7 +47,7 @@ jobs:
   semantic-release:
     name: "Semantic Release"
     needs: create-release-branch
-    runs-on: macos-11
+    runs-on: macos-latest
     env:
       GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
       GIT_AUTHOR_NAME: mparticle-automation
@@ -102,7 +102,7 @@ jobs:
   sync-repository:
     name: "Sync Repository"
     needs: semantic-release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout main branch"
         uses: actions/checkout@v2

core-sdk-samples/higgs-shop-sample-app/app/build.gradle.kts

@@ -23,7 +23,10 @@ android {
     }
     buildFeatures {
         dataBinding = true
-        viewBinding = true
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.3.1"
     }
     buildTypes {
         getByName("release") {
@@ -41,6 +44,16 @@ android {
 }
 
 dependencies {
+
+    // Compose
+    val composeVersion = "1.2.1"
+    implementation("androidx.compose.runtime:runtime:$composeVersion")
+    implementation("androidx.compose.ui:ui:$composeVersion")
+    implementation("androidx.compose.material:material:$composeVersion")
+    implementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
+
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("androidx.fragment:fragment:1.3.6")
     implementation("androidx.fragment:fragment-ktx:1.3.6")
@@ -49,7 +62,7 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
     implementation("com.google.android.material:material:1.5.0")
-    implementation("com.mparticle:android-core:5.44.2")
+    implementation("com.mparticle:android-core:5.45.0")
 
     implementation("androidx.navigation:navigation-fragment:2.3.5")
     implementation("androidx.navigation:navigation-ui:2.3.5")
@@ -75,14 +88,15 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
     implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
     implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.1.1")
 
-    val roomVersion = "2.4.1"
+    val roomVersion = "2.4.3"
     implementation("androidx.room:room-runtime:$roomVersion")
-    annotationProcessor("androidx.room:room-compiler:$roomVersion")
+    // annotationProcessor("androidx.room:room-compiler:$roomVersion")
     kapt("androidx.room:room-compiler:$roomVersion")
     // ksp("androidx.room:room-compiler:$roomVersion")
     implementation("androidx.room:room-ktx:$roomVersion")
-    // implementation("androidx.room:room-rxjava2:$roomVersion")
+    implementation("androidx.room:room-rxjava2:$roomVersion")
     // implementation("androidx.room:room-rxjava3:$roomVersion")
     // implementation("androidx.room:room-guava:$roomVersion")
     // implementation("androidx.room:room-paging:2.4.1")
@@ -105,6 +119,6 @@ dependencies {
 
 fun buildVersionCode(): Int {
     val df = SimpleDateFormat("yyyyMMddHH")
-    df.setTimeZone(TimeZone.getTimeZone("EST"))
+    df.timeZone = TimeZone.getTimeZone("EST")
     return df.format(Date()).toInt()
 }

core-sdk-samples/higgs-shop-sample-app/app/src/androidTest/kotlin/com/mparticle/example/higgsshopsampleapp/ExampleInstrumentedTests.kt

@@ -2,19 +2,15 @@ package com.mparticle.example.higgsshopsampleapp
 
 import android.content.Intent
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.platform.app.InstrumentationRegistry
 import com.mparticle.example.higgsshopsampleapp.activities.LandingActivity
 import com.mparticle.example.higgsshopsampleapp.activities.MainActivity
 import com.mparticle.example.higgsshopsampleapp.repositories.ProductsRepository
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -39,17 +35,6 @@ class ExampleInstrumentedTests {
         assertEquals("com.mparticle.example.higgsshopsampleapp", appContext.packageName)
     }
 
-    @Test
-    fun testShowLandingCTA() {
-        onView(withId(R.id.landing_cta)).check(matches(withText(R.string.landing_cta)))
-    }
-
-    @Test
-    fun testClickLandingCTA() {
-        onView(withId(R.id.landing_cta)).perform(click())
-        onView(withId(R.id.tv_shop_header)).check(matches(withText(R.string.shop_title)))
-    }
-
     @Test
     fun testProductJsonFileExists() {
         val file: InputStream =