Merge dev into master

MIGRATING.md

@@ -1,5 +1,28 @@
 ## Migration Guides
 
+### Migrating from versions < v1.7.1
+Function `addRule` is now deprecated. It's still can be used, but **Android Studio** will highlight it.
+
+**Before:**
+
+```
+view.addRule(
+    VGSInfoRule.ValidationBuilder()
+        .setRegex("^[0-9]{5}(?:-[0-9]{4})?\$")
+        .build()
+)
+```
+
+**Now:**
+
+```
+view.setRule(
+    VGSInfoRule.ValidationBuilder()
+        .setRegex("^[0-9]{5}(?:-[0-9]{4})?\$")
+        .build()
+)
+```
+
 ### Migrating from versions < v1.6.14
 
 Field state will be valid if no validation rules defined.

app/build.gradle

@@ -20,6 +20,7 @@ android {
 
         buildConfigField("String", "VAULT_ID", "\"${getLocalProperty("VGS_VAULT_ID")}\"")
         buildConfigField("String", "PATH", "\"${getLocalProperty("VGS_PATH")}\"")
+        buildConfigField("String", "ROUTE_ID", "\"${getLocalProperty("VGS_ROUTE_ID")}\"")
     }
 
     buildTypes {
@@ -53,6 +54,11 @@ android {
     }
 }
 
+repositories {
+
+    maven { url "https://jitpack.io" }
+}
+
 dependencies {
     implementation project(":vgscollect")
     implementation project(":vgscollect-cardio")
@@ -61,9 +67,11 @@ dependencies {
     implementation libs.androidx.core.ktx
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.multidex
-
     implementation libs.material
 
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'com.github.kbiakov:CodeView-Android:1.3.2'
+
     debugImplementation debugLibs.leakcanary
 
     testImplementation testLibs.junit

app/src/androidTest/java/com/verygoodsecurity/demoapp/tests/flows/ActivityCaseInstrumentedTest.kt

@@ -8,7 +8,7 @@ import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents.*
-import androidx.test.espresso.intent.matcher.IntentMatchers.*
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -196,14 +196,18 @@ class ActivityCaseInstrumentedTest {
     }
 
     private fun startMainScreen() {
-        val startWithActivityBtn = onView(withId(R.id.startWithActivityBtn))
-            .check(matches(isDisplayed()))
-
-        onView(withId(R.id.userVault)).perform(
+        onView(withId(R.id.tiedVaultId)).perform(
             typeText(Utils.DEFAULT_TENANT_ID),
             closeSoftKeyboard()
         )
-        onView(withId(R.id.userPath)).perform(typeText(Utils.DEFAULT_PATH), closeSoftKeyboard())
+        onView(withId(R.id.tiedPath)).perform(
+            typeText(Utils.DEFAULT_PATH),
+            closeSoftKeyboard()
+        )
+
+        val startWithActivityBtn = onView(withId(R.id.llCollectActivityFlow))
+            .perform(scrollTo())
+            .check(matches(isDisplayed()))
 
         performClick(startWithActivityBtn)
     }

app/src/androidTest/java/com/verygoodsecurity/demoapp/tests/flows/FragmentCaseInstrumentedTest.kt

@@ -211,11 +211,12 @@ class FragmentCaseInstrumentedTest {
     }
 
     private fun startMainScreen() {
-        val startWithActivityBtn = onView(withId(R.id.startWithFragmentBtn))
-            .check(matches(isDisplayed()))
+        onView(withId(R.id.tiedVaultId)).perform(typeText(Utils.DEFAULT_TENANT_ID))
+        onView(withId(R.id.tiedPath)).perform(typeText(Utils.DEFAULT_PATH), closeSoftKeyboard())
 
-        onView(withId(R.id.userVault)).perform(typeText(Utils.DEFAULT_TENANT_ID))
-        onView(withId(R.id.userPath)).perform(typeText(Utils.DEFAULT_PATH), closeSoftKeyboard())
+        val startWithActivityBtn = onView(withId(R.id.llCollectFragmentFlow))
+            .perform(scrollTo())
+            .check(matches(isDisplayed()))
 
         startWithActivityBtn.perform(click())
     }

app/src/androidTest/java/com/verygoodsecurity/demoapp/tests/flows/ViewPagerCaseInstrumentedTest.kt

@@ -4,6 +4,7 @@ import android.widget.DatePicker
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.PickerActions
 import androidx.test.espresso.matcher.ViewMatchers.*
@@ -179,7 +180,8 @@ class ViewPagerCaseInstrumentedTest {
     }
 
     private fun startMainScreen() {
-        val startWithActivityBtn = onView(withId(R.id.startWithViewPagerBtn))
+        val startWithActivityBtn = onView(withId(R.id.llCollectViewPagerFlow))
+            .perform(scrollTo())
             .check(matches(isDisplayed()))
 
         startWithActivityBtn.perform(click())

app/src/main/AndroidManifest.xml

@@ -11,7 +11,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
 
         <activity
             android:name=".StartActivity"
@@ -28,18 +29,31 @@
             </intent-filter>
         </activity>
 
-
         <activity
             android:name=".activity_case.VGSCollectActivity"
-            android:label="Activity Demo" />
+            android:label="Collect (Activity)" />
+
+        <!--        TODO(Think about resize)-->
+        <activity
+            android:name=".tokenization.TokenizationActivity"
+            android:label="Tokenization"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".tokenization.settings.TokenizationSettingsActivity"
+            android:label="Settings"
+            android:theme="@style/AppTheme.TokenizationSettings"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
 
         <activity
             android:name=".fragment_case.VGSCollectFragmentActivity"
-            android:label="Fragment Demo" />
+            android:label="Collect (Fragment)" />
 
         <activity
             android:name=".viewpager_case.VGSViewPagerActivity"
-            android:label="ViewPager Demo" />
+            android:label="Collect (ViewPager)" />
 
         <activity
             android:name=".instrumented.VGSEditTextInputTypeActivity"

app/src/main/java/com/verygoodsecurity/demoapp/StartActivity.kt

@@ -3,91 +3,58 @@ package com.verygoodsecurity.demoapp
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
-import android.widget.ArrayAdapter
 import androidx.appcompat.app.AppCompatActivity
 import com.verygoodsecurity.demoapp.activity_case.VGSCollectActivity
 import com.verygoodsecurity.demoapp.fragment_case.VGSCollectFragmentActivity
+import com.verygoodsecurity.demoapp.tokenization.TokenizationActivity
 import com.verygoodsecurity.demoapp.viewpager_case.VGSViewPagerActivity
-import com.verygoodsecurity.vgscollect.core.Environment
 import kotlinx.android.synthetic.main.activity_start.*
 
-class StartActivity:AppCompatActivity(), View.OnClickListener {
-
-    companion object {
-        const val VAULT_ID = "user_vault_id"
-        const val ENVIROMENT = "user_env"
-        const val PATH = "user_path"
-    }
-
-    private val spinnerAdapter:ArrayAdapter<String> by lazy {
-        val envArr = arrayOf(
-            Environment.SANDBOX.rawValue.toUpperCase(),
-            Environment.LIVE.rawValue.toUpperCase()
-        )
-        val layout = android.R.layout.simple_spinner_item
-        val spinnerArrayAdapter = ArrayAdapter<String>(this, layout, envArr)
-
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-
-        spinnerArrayAdapter
-    }
+class StartActivity : AppCompatActivity(R.layout.activity_start) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_start)
-
-        setupSpinner()
-        setupUI()
-
-        startWithActivityBtn?.setOnClickListener(this)
-        startWithFragmentBtn?.setOnClickListener(this)
-        startWithViewPagerBtn?.setOnClickListener(this)
-    }
-
-    private fun setupUI() {
-        userVault?.setText(BuildConfig.VAULT_ID)
-        userPath?.setText(BuildConfig.PATH)
-
-        environmentSpinner.setSelection(BuildConfig.ENVIRINMENT.ordinal)
+        setupViews()
     }
 
-    private fun setupSpinner() {
-        environmentSpinner.adapter = spinnerAdapter
-    }
-
-    override fun onClick(v: View) {
-        when(v.id) {
-            R.id.startWithActivityBtn -> startInteractionWithActivity()
-            R.id.startWithFragmentBtn -> startInteractionWithFragment()
-            R.id.startWithViewPagerBtn -> startInteractionWithViewPager()
+    private fun setupViews() {
+        tiedVaultId?.setText(BuildConfig.VAULT_ID)
+        tiedPath?.setText(BuildConfig.PATH)
+        llTokenizationFlow?.setOnClickListener {
+            startActivity(TokenizationActivity::class.java)
+        }
+        llCollectActivityFlow?.setOnClickListener {
+            startActivity(VGSCollectActivity::class.java)
+        }
+        llCollectFragmentFlow?.setOnClickListener {
+            startActivity(VGSCollectFragmentActivity::class.java)
+        }
+        llCollectViewPagerFlow?.setOnClickListener {
+            startActivity(VGSViewPagerActivity::class.java)
         }
     }
 
-    private fun startInteractionWithActivity() {
-        val intent = prepareIntent(VGSCollectActivity::class.java)
-        startActivity(intent)
+    private fun startActivity(activity: Class<out Activity>) {
+        startActivity(Intent(this, activity).apply {
+            putExtra(KEY_BUNDLE_VAULT_ID, tiedVaultId.text.toString())
+            putExtra(KEY_BUNDLE_PATH, tiedPath.text.toString())
+            putExtra(KEY_BUNDLE_ENVIRONMENT, getEnvironment())
+        })
     }
 
-    private fun startInteractionWithFragment() {
-        val intent = prepareIntent(VGSCollectFragmentActivity::class.java)
-        startActivity(intent)
+    private fun getEnvironment() = when (mbGroupEnvironment.checkedButtonId) {
+        R.id.mbSandbox -> SANDBOX
+        R.id.mbLive -> LIVE
+        else -> throw IllegalArgumentException("Not implemented")
     }
 
-    private fun startInteractionWithViewPager() {
-        val intent = prepareIntent(VGSViewPagerActivity::class.java)
-        startActivity(intent)
-    }
+    companion object {
 
-    private fun prepareIntent(componentClass: Class<out Activity>):Intent {
-        return Intent(this, componentClass).apply {
-            val vaultId = userVault.text.toString()
-            val path = userPath.text.toString()
-            val env = environmentSpinner.selectedItemPosition
+        private const val SANDBOX = "sandbox"
+        private const val LIVE = "live"
 
-            putExtra(VAULT_ID, vaultId)
-            putExtra(ENVIROMENT, env)
-            putExtra(PATH, path)
-        }
+        const val KEY_BUNDLE_VAULT_ID = "user_vault_id"
+        const val KEY_BUNDLE_ENVIRONMENT = "user_env"
+        const val KEY_BUNDLE_PATH = "user_path"
     }
 }

app/src/main/java/com/verygoodsecurity/demoapp/activity_case/VGSCollectActivity.kt

@@ -143,7 +143,7 @@ class VGSCollectActivity : AppCompatActivity(), VgsCollectResponseListener, View
 
             .build()
 
-        cardNumberField.addRule(rule)
+        cardNumberField.setRule(rule)
     }
 
     private fun addCustomBrands() {
@@ -229,14 +229,14 @@ class VGSCollectActivity : AppCompatActivity(), VgsCollectResponseListener, View
     }
 
     private fun retrieveSettings() {
-        VGSCollectLogger.logLevel = VGSCollectLogger.Level.WARN
+        VGSCollectLogger.logLevel = VGSCollectLogger.Level.DEBUG
 
         val bndl = intent?.extras
 
-        vault_id = bndl?.getString(StartActivity.VAULT_ID, "") ?: ""
-        path = bndl?.getString(StartActivity.PATH, "/") ?: ""
+        vault_id = bndl?.getString(StartActivity.KEY_BUNDLE_VAULT_ID, "") ?: ""
+        path = bndl?.getString(StartActivity.KEY_BUNDLE_PATH, "/") ?: ""
 
-        val envId = bndl?.getInt(StartActivity.ENVIROMENT, 0) ?: 0
+        val envId = bndl?.getInt(StartActivity.KEY_BUNDLE_ENVIRONMENT, 0) ?: 0
         env = Environment.values()[envId]
 
         vgsForm = VGSCollect.Builder(this, vault_id)
@@ -329,6 +329,7 @@ class VGSCollectActivity : AppCompatActivity(), VgsCollectResponseListener, View
             is VGSResponse.SuccessResponse -> responseContainerView.text =
                 "Code: ${response.successCode}"
             is VGSResponse.ErrorResponse -> responseContainerView.text = response.toString()
+            else -> return
         }
     }