New version 3.0.0. Rebranded example to cm style

Author: eduardo.alonso

README.md

@@ -1,31 +1,25 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-kapt'
 }
 
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         minSdk 25
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "2.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.launcherTheme = "@style/Base.Launcher"
         manifestPlaceholders.appIcon = "@mipmap/ic_launcher"
-
-        setProperty("archivesBaseName", "ecr-$versionName")
     }
 
     buildTypes {
-        debug {
-            // minifyEnabled true
-            // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            manifestPlaceholders.appIcon = "@mipmap/ic_launcher_dev"
-            applicationIdSuffix = ".debug"
-        }
+        debug { }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -78,8 +72,9 @@ dependencies {
     debugImplementation "androidx.test.ext:junit:$rootProject.ext.androidx_junit"
     debugImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espresso_core"
     debugImplementation "androidx.test:runner:$rootProject.ext.espresso"
-    debugImplementation "androidx.test:rules:$rootProject.ext.espresso"
-    debugImplementation "androidx.test:core-ktx:$rootProject.ext.espresso"
+    debugImplementation "androidx.test:rules:$rootProject.ext.test_rules"
+    debugImplementation "androidx.test:core-ktx:$rootProject.ext.test_rules"
+    implementation "com.android.support.test.espresso:espresso-idling-resource:$rootProject.ext.espresso"
     debugImplementation "androidx.fragment:fragment-testing:$rootProject.ext.fragment_testing"
     debugImplementation "androidx.navigation:navigation-testing:$rootProject.ext.nav_version"
 
@@ -95,4 +90,7 @@ dependencies {
 
     // Sunmi
     implementation "com.sunmi:printerlibrary:$rootProject.ext.printer"
+
+    // Lottie animation
+    implementation "com.airbnb.android:lottie:$lottie_version"
 }

app/build.gradle

@@ -114,7 +114,7 @@ class PaymentActivityTest: KoinComponent {
         activityRule.scenario.onActivity { a ->
             a.onSupportNavigateUp()
         }
-        onView(withId(R.id.ecr_drawer)).check(matches(isDisplayed()))
-        onView(withId(R.id.ecr_navigation)).check(matches(isDisplayed()))
+        onView(withId(R.id.drawer)).check(matches(isDisplayed()))
+        onView(withId(R.id.ecr_preauth_expandible_list)).check(matches(isDisplayed()))
     }
 }

app/src/androidTest/java/com/cm/payplaza/ecr_sdk_integration/PaymentActivityTest.kt

@@ -64,14 +64,14 @@ class RefundActivityTest: KoinComponent {
         onView(ViewMatchers.withId(R.id.keypad_button_3)).perform(ViewActions.click())
         onView(ViewMatchers.withId(R.id.amount_view_amount)).check(ViewAssertions.matches(ViewMatchers.withText("*****")))
         Thread.sleep(200)
-        onView(ViewMatchers.withId(R.id.keypad_button_confirm)).perform(ViewActions.click())
+        onView(ViewMatchers.withId(R.id.actionButton)).perform(ViewActions.click())
         Thread.sleep(200)
         onView(ViewMatchers.withId(R.id.keypad_button_1)).perform(ViewActions.click())
         onView(ViewMatchers.withId(R.id.keypad_button_0)).perform(ViewActions.click())
         onView(ViewMatchers.withId(R.id.keypad_button_0)).perform(ViewActions.click())
         onView(ViewMatchers.withId(R.id.amount_view_amount)).check(ViewAssertions.matches(ViewMatchers.withText("1.00")))
         Thread.sleep(200)
-        onView(ViewMatchers.withId(R.id.keypad_button_confirm)).perform(ViewActions.click())
+        onView(ViewMatchers.withId(R.id.actionButton)).perform(ViewActions.click())
         Thread.sleep(200)
         if("NL" != localDataRepository.getTerminalData()?.storeCountry) {
             onView(ViewMatchers.withId(R.id.keypad_button_1)).perform(ViewActions.click())
@@ -82,7 +82,7 @@ class RefundActivityTest: KoinComponent {
             onView(ViewMatchers.withId(R.id.keypad_button_6)).perform(ViewActions.click())
             onView(ViewMatchers.withId(R.id.amount_view_amount)).check(ViewAssertions.matches(ViewMatchers.withText("123456")))
             Thread.sleep(200)
-            onView(ViewMatchers.withId(R.id.keypad_button_confirm)).perform(ViewActions.click())
+            onView(ViewMatchers.withId(R.id.actionButton)).perform(ViewActions.click())
             Thread.sleep(200)
             onView(ViewMatchers.withId(R.id.date_component_view)).perform(ViewActions.click())
         }

app/src/androidTest/java/com/cm/payplaza/ecr_sdk_integration/RefundActivityTest.kt

@@ -1,18 +1,17 @@
 package com.cm.payplaza.ecr_sdk_integration
 
-import androidx.fragment.app.testing.FragmentScenario
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.lifecycle.Lifecycle
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingPolicies
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.cm.payplaza.ecr_sdk_integration.domain.repository.localData.LocalDataRepository
 import com.cm.payplaza.ecr_sdk_integration.entity.Transaction
 import com.cm.payplaza.ecr_sdk_integration.entity.TransactionError
 import com.cm.payplaza.ecr_sdk_integration.entity.TransactionResponse
-import com.cm.payplaza.ecr_sdk_integration.fragment.receiptView.ReceiptViewFragment
+import com.cm.payplaza.ecr_sdk_integration.fragment.receiptView.ReceiptFragment
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -24,7 +23,7 @@ import java.util.concurrent.TimeUnit
 
 @RunWith(AndroidJUnit4::class)
 class TransactionResultActivityTest: KoinComponent {
-    private lateinit var fragmentScenario: FragmentScenario<ReceiptViewFragment>
+
     private val localDataRepository: LocalDataRepository by inject()
     private val purchaseTransaction: Transaction by inject(qualifier = named("purchaseTransaction"))
     private val transactionResultSuccess: TransactionResponse by inject(qualifier = named("transactionResultSuccess"))
@@ -46,13 +45,10 @@ class TransactionResultActivityTest: KoinComponent {
 
     @Test
     fun showReceiptFragment() {
-        fragmentScenario = launchFragmentInContainer()
-        onView(withId(R.id.receipt_view_close_button)).check(matches(isDisplayed()))
-        onView(withId(R.id.receipt_view_close_button)).check(matches(isClickable()))
-        onView(withId(R.id.receipt_view_button_print)).check(matches(isClickable()))
-        onView(withId(R.id.textview_receipt)).check(matches(isDisplayed()))
-        Thread.sleep(2000)
-        onView(withId(R.id.receipt_view_close_button)).perform(ViewActions.click())
+        val fragmentScenario = launchFragmentInContainer<ReceiptFragment>(
+            initialState = Lifecycle.State.RESUMED, themeResId = R.style.AppTheme
+        )
+        
         onView(withId(R.id.textview_receipt)).check(matches(isDisplayed()))
         Thread.sleep(2000)
     }