feat: add branded splash page (#5)

Author: mchuangatmp

.github/workflows/pull-request.yml

@@ -1,6 +1,6 @@
 name: "Pull Request"
 
-on: [ workflow_dispatch, pull_request ]
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
 

core-sdk-samples/higgs-shop-sample-app/README.md

@@ -12,13 +12,13 @@ The purpose of the app is to highlight the following features:
 
 ## Getting Started
 
-1. In this repo, open a sample app (inside samples folder) in Android Studio
+1. Open this repository in Android Studio after cloning
 
-2. Update the `HIGGS_SHOP_SAMPLE_APP_KEY` variable with your mParticle Android API Key inside app/build.gradle.kts file
+2. Update the `HIGGS_SHOP_SAMPLE_APP_KEY` and `HIGGS_SHOP_SAMPLE_APP_SECRET` variable with your mParticle Android API Key inside app/build.gradle.kts file
 
 -   Visit your [mParticle Workspace](https://app.mparticle.com/setup/inputs/apps) to generate API Credentials
 
-3. Run the project in Android emulator.  This will open the Higgs Shop Sample App
+3. Run the Higgs Shop sample app project (inside core-sdk-samples folder) in Android emulator.  This will open the Higgs Shop Sample App
 
 ### API Credentials
 

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

@@ -20,7 +20,6 @@ android {
         buildConfigField("String", "HIGGS_SHOP_SAMPLE_APP_KEY", "\"${System.getenv("HIGGS_SHOP_SAMPLE_APP_KEY")}\"")
         buildConfigField("String", "HIGGS_SHOP_SAMPLE_APP_SECRET", "\"${System.getenv("HIGGS_SHOP_SAMPLE_APP_SECRET")}\"")
     }
-
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
@@ -37,12 +36,18 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("com.google.android.material:material:1.5.0")
-
-    implementation("com.mparticle:android-core:5.35.2")
-
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    implementation("com.mparticle:android-core:5.35.3")
     testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test:core:1.4.0")
+    androidTestImplementation("androidx.test:core-ktx:1.4.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation("androidx.test:rules:1.4.0")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
+    androidTestImplementation("androidx.test.ext:truth:1.4.0")
+    androidTestImplementation("com.google.truth:truth:1.1.3")
+    androidTestImplementation("androidx.test:runner:1.4.0")
+    androidTestUtil("androidx.test:orchestrator:1.4.1")
 }
 
 fun buildVersionCode(): Int {

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

@@ -0,0 +1,35 @@
+package com.mparticle.example.higgsshopsampleapp
+
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+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 org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ExampleInstrumentedTests {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<LandingActivity>()
+
+    @Test
+    fun testUseAppContext() {
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.mparticle.example.higgsshopsampleapp", appContext.packageName)
+    }
+
+    @Test
+    fun testShowLandingCTA() {
+        onView(withId(R.id.landing_cta)).check(matches(withText(R.string.landing_cta)))
+    }
+}

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

@@ -11,17 +11,21 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.HiggsShopSampleApp">
+        android:theme="@style/Theme.mParticle.Activity.Landing">
         <activity
-            android:name="com.mparticle.example.higgsshopsampleapp.SplashActivity"
-            android:noHistory="true"
-            android:theme="@style/Theme.mParticle.Activity.Splash"
+            android:name="com.mparticle.example.higgsshopsampleapp.activities.SplashActivity"
+            android:theme="@style/Theme.mParticle.Activity.Landing"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.mparticle.example.higgsshopsampleapp.activities.LandingActivity"
+            android:theme="@style/Theme.mParticle.Activity.Landing"
+            android:exported="true">
+        </activity>
     </application>
 </manifest>

core-sdk-samples/higgs-shop-sample-app/app/src/main/AndroidManifest.xml

@@ -17,5 +17,4 @@ class HiggsShopSampleApplication: Application() {
 
         MParticle.start(options)
     }
-
 }

core-sdk-samples/higgs-shop-sample-app/app/src/main/ic_launcher-playstore.png

@@ -0,0 +1,17 @@
+package com.mparticle.example.higgsshopsampleapp.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.mparticle.MParticle
+import com.mparticle.example.higgsshopsampleapp.R
+
+
+class LandingActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_landing)
+        MParticle.getInstance()?.logScreen("Landing")
+    }
+}