Skip to content

Commit

Permalink
Merge pull request #12 from verygoodsecurity/stage
Browse files Browse the repository at this point in the history
Release v1.1.16
  • Loading branch information
Dmytro Kos authored Jun 30, 2020
2 parents 2b736ce + 8b81ad2 commit 0274651
Show file tree
Hide file tree
Showing 177 changed files with 1,444 additions and 707 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ import com.verygoodsecurity.vgscollect.core.model.network.VGSRequest
import com.verygoodsecurity.vgscollect.core.model.network.VGSResponse
import com.verygoodsecurity.vgscollect.core.model.state.FieldState
import com.verygoodsecurity.vgscollect.core.storage.OnFieldStateChangeListener
import com.verygoodsecurity.vgscollect.view.card.BrandParams
import com.verygoodsecurity.vgscollect.view.card.CardType
import com.verygoodsecurity.vgscollect.view.card.ChecksumAlgorithm
import com.verygoodsecurity.vgscollect.view.card.CustomCardBrand
import com.verygoodsecurity.vgscollect.view.card.formatter.CardMaskAdapter
import com.verygoodsecurity.vgscollect.view.card.icon.CardIconAdapter
import com.verygoodsecurity.vgscollect.view.card.validation.payment.PersonNameRule
import kotlinx.android.synthetic.main.activity_collect_demo.*

class VGSCollectActivity: AppCompatActivity(), VgsCollectResponseListener, View.OnClickListener {
Expand Down Expand Up @@ -76,6 +80,14 @@ class VGSCollectActivity: AppCompatActivity(), VgsCollectResponseListener, View.
}

private fun setupCardHolderField() {
val rule : PersonNameRule = PersonNameRule.ValidationBuilder()
// .setRegex("^([a-zA-Z]{2,}\\s[a-zA-z]{1,})\$")
.setAllowableMinLength(3)
.setAllowableMaxLength(7)
.build()

cardHolderField.addRule(rule)

vgsForm.bindView(cardHolderField)
cardHolderField?.setOnFieldStateChangeListener(object : OnFieldStateChangeListener {
override fun onStateChange(state: FieldState) {
Expand Down Expand Up @@ -104,6 +116,8 @@ class VGSCollectActivity: AppCompatActivity(), VgsCollectResponseListener, View.
}

private fun setupCardNumberField() {
addCustomBrands()

vgsForm.bindView(cardNumberField)

cardNumberField.setCardIconAdapter(object : CardIconAdapter(this) {
Expand Down Expand Up @@ -143,6 +157,37 @@ class VGSCollectActivity: AppCompatActivity(), VgsCollectResponseListener, View.
})
}

private fun addCustomBrands() {
val params = BrandParams(
"### ### ### ###",
ChecksumAlgorithm.LUHN,
arrayOf(4, 10, 12),
arrayOf(3, 5)
)
val newBrand = CustomCardBrand(
"^777",
"NEW BRAND",
R.drawable.ic_cards,
params
)
cardNumberField.addCardBrand(newBrand)


val params2 = BrandParams(
"### ### ### ###",
ChecksumAlgorithm.LUHN,
arrayOf(18),
arrayOf(4)
)
val newBrand2 = CustomCardBrand(
"^878",
"VGS Brand",
CardType.MAESTRO.resId,
params2
)
cardNumberField.addCardBrand(newBrand2)
}

private fun retrieveSettings() {
val bndl = intent?.extras

Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/layout/activity_collect_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@
app:fieldName="card_data.cardNumber"
style="@style/AppTheme.PaymentField"
app:numberDivider="-"
app:enableValidation="false"
app:isRequired="false"
app:fontFamily="@font/robotomono_light"
android:nextFocusDown="@+id/cardHolderField"
app:imeOptions="actionNext"
Expand Down Expand Up @@ -172,7 +170,7 @@
app:imeOptions="actionNext"
app:fontFamily="@font/robotomono_light"
app:fieldName="card_data.personal_data.cardHolder"
app:text="John Galt"/>
app:text="John Galt I"/>
</com.verygoodsecurity.vgscollect.widget.VGSTextInputLayout>
</FrameLayout>

Expand Down
9 changes: 7 additions & 2 deletions docs/allclasses-frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:50 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>All Classes</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand All @@ -16,12 +16,15 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/verygoodsecurity/vgscollect/app/BaseTransmitActivity.html" title="class in com.verygoodsecurity.vgscollect.app" target="classFrame">BaseTransmitActivity</a></li>
<li><a href="com/verygoodsecurity/vgscollect/app/BaseTransmitActivity.Companion.html" title="class in com.verygoodsecurity.vgscollect.app" target="classFrame">BaseTransmitActivity.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/util/BooleanExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util" target="classFrame">BooleanExtensionKt</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/BrandParams.html" title="class in com.verygoodsecurity.vgscollect.view.card" target="classFrame">BrandParams</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/icon/CardIconAdapter.html" title="class in com.verygoodsecurity.vgscollect.view.card.icon" target="classFrame">CardIconAdapter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardMaskAdapter.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter" target="classFrame">CardMaskAdapter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardNumberFormatter.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter" target="classFrame">CardNumberFormatter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardNumberFormatter.Companion.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter" target="classFrame">CardNumberFormatter.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/CardType.html" title="enum in com.verygoodsecurity.vgscollect.view.card" target="classFrame">CardType</a></li>
<li><a href="com/verygoodsecurity/vgscollect/widget/CardVerificationCodeEditText.html" title="class in com.verygoodsecurity.vgscollect.widget" target="classFrame">CardVerificationCodeEditText</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/ChecksumAlgorithm.html" title="enum in com.verygoodsecurity.vgscollect.view.card" target="classFrame">ChecksumAlgorithm</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/CompositeValidator.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation" target="classFrame">CompositeValidator</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/CustomCardBrand.html" title="class in com.verygoodsecurity.vgscollect.view.card" target="classFrame">CustomCardBrand</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/date/DatePickerMode.html" title="enum in com.verygoodsecurity.vgscollect.view.date" target="classFrame">DatePickerMode</a></li>
<li><a href="com/verygoodsecurity/vgscollect/core/Environment.html" title="enum in com.verygoodsecurity.vgscollect.core" target="classFrame">Environment</a></li>
Expand All @@ -47,6 +50,8 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/verygoodsecurity/vgscollect/util/NumberExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util" target="classFrame">NumberExtensionKt</a></li>
<li><a href="com/verygoodsecurity/vgscollect/core/storage/OnFieldStateChangeListener.html" title="interface in com.verygoodsecurity.vgscollect.core.storage" target="classFrame"><span class="interfaceName">OnFieldStateChangeListener</span></a></li>
<li><a href="com/verygoodsecurity/vgscollect/widget/PersonNameEditText.html" title="class in com.verygoodsecurity.vgscollect.widget" target="classFrame">PersonNameEditText</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/payment/PersonNameRule.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation.payment" target="classFrame">PersonNameRule</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/payment/PersonNameRule.ValidationBuilder.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation.payment" target="classFrame">PersonNameRule.ValidationBuilder</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/SavedState.Companion.html" title="class in com.verygoodsecurity.vgscollect.view" target="classFrame">SavedState.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/material/TextInputFieldLayout.html" title="class in com.verygoodsecurity.vgscollect.view.material" target="classFrame">TextInputFieldLayout</a></li>
<li><a href="com/verygoodsecurity/vgscollect/util/UriExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util" target="classFrame">UriExtensionKt</a></li>
Expand Down
9 changes: 7 additions & 2 deletions docs/allclasses-noframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:50 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>All Classes</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand All @@ -16,12 +16,15 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/verygoodsecurity/vgscollect/app/BaseTransmitActivity.html" title="class in com.verygoodsecurity.vgscollect.app">BaseTransmitActivity</a></li>
<li><a href="com/verygoodsecurity/vgscollect/app/BaseTransmitActivity.Companion.html" title="class in com.verygoodsecurity.vgscollect.app">BaseTransmitActivity.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/util/BooleanExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util">BooleanExtensionKt</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/BrandParams.html" title="class in com.verygoodsecurity.vgscollect.view.card">BrandParams</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/icon/CardIconAdapter.html" title="class in com.verygoodsecurity.vgscollect.view.card.icon">CardIconAdapter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardMaskAdapter.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter">CardMaskAdapter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardNumberFormatter.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter">CardNumberFormatter</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/formatter/CardNumberFormatter.Companion.html" title="class in com.verygoodsecurity.vgscollect.view.card.formatter">CardNumberFormatter.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/CardType.html" title="enum in com.verygoodsecurity.vgscollect.view.card">CardType</a></li>
<li><a href="com/verygoodsecurity/vgscollect/widget/CardVerificationCodeEditText.html" title="class in com.verygoodsecurity.vgscollect.widget">CardVerificationCodeEditText</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/ChecksumAlgorithm.html" title="enum in com.verygoodsecurity.vgscollect.view.card">ChecksumAlgorithm</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/CompositeValidator.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation">CompositeValidator</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/CustomCardBrand.html" title="class in com.verygoodsecurity.vgscollect.view.card">CustomCardBrand</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/date/DatePickerMode.html" title="enum in com.verygoodsecurity.vgscollect.view.date">DatePickerMode</a></li>
<li><a href="com/verygoodsecurity/vgscollect/core/Environment.html" title="enum in com.verygoodsecurity.vgscollect.core">Environment</a></li>
Expand All @@ -47,6 +50,8 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/verygoodsecurity/vgscollect/util/NumberExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util">NumberExtensionKt</a></li>
<li><a href="com/verygoodsecurity/vgscollect/core/storage/OnFieldStateChangeListener.html" title="interface in com.verygoodsecurity.vgscollect.core.storage"><span class="interfaceName">OnFieldStateChangeListener</span></a></li>
<li><a href="com/verygoodsecurity/vgscollect/widget/PersonNameEditText.html" title="class in com.verygoodsecurity.vgscollect.widget">PersonNameEditText</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/payment/PersonNameRule.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation.payment">PersonNameRule</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/card/validation/payment/PersonNameRule.ValidationBuilder.html" title="class in com.verygoodsecurity.vgscollect.view.card.validation.payment">PersonNameRule.ValidationBuilder</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/SavedState.Companion.html" title="class in com.verygoodsecurity.vgscollect.view">SavedState.Companion</a></li>
<li><a href="com/verygoodsecurity/vgscollect/view/material/TextInputFieldLayout.html" title="class in com.verygoodsecurity.vgscollect.view.material">TextInputFieldLayout</a></li>
<li><a href="com/verygoodsecurity/vgscollect/util/UriExtensionKt.html" title="class in com.verygoodsecurity.vgscollect.util">UriExtensionKt</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>BaseTransmitActivity.Companion</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.app.BaseTransmitActivity.Companion class">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>BaseTransmitActivity</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.app.BaseTransmitActivity class">
<meta name="keywords" content="RESULT_DATA">
<meta name="keywords" content="Companion">
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/app/package-frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:50 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>com.verygoodsecurity.vgscollect.app</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.app package">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/app/package-summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:50 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>com.verygoodsecurity.vgscollect.app</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.app package">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/app/package-tree.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:50 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>com.verygoodsecurity.vgscollect.app Class Hierarchy</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/core/Environment.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Environment</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.core.Environment class">
<meta name="keywords" content="getRawValue()">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/core/HTTPMethod.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>HTTPMethod</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.core.HTTPMethod class">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions docs/com/verygoodsecurity/vgscollect/core/VGSCollect.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>VGSCollect</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.core.VGSCollect class">
<meta name="keywords" content="addOnResponseListeners()">
<meta name="keywords" content="bindView()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>VgsCollectResponseListener</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.core.VgsCollectResponseListener interface">
<meta name="keywords" content="onResponse()">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_242-release) on Fri Jun 12 19:26:49 EEST 2020 -->
<!-- Generated by javadoc (1.8.0_242-release) on Tue Jun 30 18:15:00 EEST 2020 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>VGSError</title>
<meta name="date" content="2020-06-12">
<meta name="date" content="2020-06-30">
<meta name="keywords" content="com.verygoodsecurity.vgscollect.core.model.network.VGSError class">
<meta name="keywords" content="getCode()">
<meta name="keywords" content="getMessageResId()">
Expand Down
Loading

0 comments on commit 0274651

Please sign in to comment.