From 1f2886717d5d5c9ab33adbaa2cc882ecff2d81fb Mon Sep 17 00:00:00 2001
From: "a.shishkin1" <a.shishkin1@tinkoff.ru>
Date: Wed, 5 Dec 2018 14:06:18 +0300
Subject: [PATCH 01/13] custom localization init

---
 .../tinkoff/acquiring/payment/TinkoffPay.kt   |   6 +-
 .../acquiring/sample/ui/MainActivity.java     |   2 +-
 .../acquiring/sample/ui/PayableActivity.java  |   2 +-
 sample/src/main/res/values/style_custom.xml   |   5 -
 ui/build.gradle                               |   2 +-
 .../acquiring/sdk/AttachCardFormActivity.java |  59 +++---
 .../acquiring/sdk/AttachCardFormFragment.java |  33 +++-
 .../acquiring/sdk/AttachCardFormStarter.java  |  37 ++--
 .../acquiring/sdk/CardListFragment.java       |  17 +-
 .../tinkoff/acquiring/sdk/DialogsManager.java |   9 +-
 .../acquiring/sdk/EnterCardFragment.java      | 180 ++++++------------
 .../acquiring/sdk/FullCardScanner.java        |  16 +-
 .../acquiring/sdk/IBaseSdkActivity.java       |   4 +-
 .../sdk/LoopConfirmationFragment.java         |  10 +-
 .../acquiring/sdk/PayFormActivity.java        | 105 ++++------
 .../tinkoff/acquiring/sdk/PayFormStarter.java |  68 ++++---
 .../acquiring/sdk/TAcqIntentExtra.java        |  42 ++++
 .../inflate/attach/AttachCellInflater.java    |  11 +-
 .../sdk/inflate/pay/PayCellInflater.java      |  17 +-
 .../sdk/localization/AsdkLocalization.java    | 108 +++++++++++
 .../sdk/localization/AsdkLocalizations.java   | 172 +++++++++++++++++
 .../localization/FileLocalizationParser.java  |  38 ++++
 .../localization/GsonLocalizationParser.java  |  20 ++
 .../sdk/localization/HasAsdkLocalization.java |  40 ++++
 .../sdk/localization/LocalizationParser.java  |  19 ++
 .../RawResourceLocalizationParser.java        |  36 ++++
 .../acquiring/sdk/localization/Utility.java   |  24 +++
 .../sdk/nfc/AsdkNfcScanActivity.java          |  20 +-
 ui/src/main/res/layout/acq_activity_nfc.xml   |   3 +-
 ui/src/main/res/layout/acq_cell_amount.xml    |   2 +-
 .../acq_cell_payment_card_requisites.xml      |   3 +-
 .../res/layout/acq_fragment_attach_card.xml   |  80 --------
 .../res/layout/acq_fragment_enter_card.xml    | 146 --------------
 .../layout/acq_fragment_loop_confirmation.xml |   5 +-
 ui/src/main/res/layout/acq_item_new_card.xml  |   3 +-
 ui/src/main/res/menu/menu_delete_card.xml     |  10 -
 ui/src/main/res/raw/acq_localization_en.json  |  51 +++++
 ui/src/main/res/raw/acq_localization_ru.json  |  51 +++++
 ui/src/main/res/values-ru/strings.xml         |  42 ----
 ui/src/main/res/values/attrs.xml              |   3 -
 ui/src/main/res/values/ids.xml                |   7 +
 ui/src/main/res/values/strings.xml            |  40 ----
 ui/src/main/res/values/styles.xml             |   8 -
 43 files changed, 907 insertions(+), 649 deletions(-)
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/TAcqIntentExtra.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/FileLocalizationParser.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/GsonLocalizationParser.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/HasAsdkLocalization.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/LocalizationParser.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/RawResourceLocalizationParser.java
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Utility.java
 delete mode 100644 ui/src/main/res/layout/acq_fragment_attach_card.xml
 delete mode 100644 ui/src/main/res/layout/acq_fragment_enter_card.xml
 delete mode 100644 ui/src/main/res/menu/menu_delete_card.xml
 create mode 100644 ui/src/main/res/raw/acq_localization_en.json
 create mode 100644 ui/src/main/res/raw/acq_localization_ru.json
 create mode 100644 ui/src/main/res/values/ids.xml

diff --git a/payment/src/main/java/ru/tinkoff/acquiring/payment/TinkoffPay.kt b/payment/src/main/java/ru/tinkoff/acquiring/payment/TinkoffPay.kt
index 72d447d..8d5135b 100644
--- a/payment/src/main/java/ru/tinkoff/acquiring/payment/TinkoffPay.kt
+++ b/payment/src/main/java/ru/tinkoff/acquiring/payment/TinkoffPay.kt
@@ -48,10 +48,10 @@ class TinkoffPay private constructor(private var sdk: AcquiringSdk,
     private fun PayFormStarter.addPaymentUiData(paymentDataUi: PaymentDataUi): PayFormStarter {
         paymentDataUi.apply {
             if (card != null && paymentInfo != null) {
-                intent.putExtra(PayFormActivity.EXTRA_CARD_DATA, CardsArrayBundlePacker().pack(arrayOf(paymentDataUi.card)))
-                intent.putExtra(PayFormActivity.EXTRA_PAYMENT_INFO, PaymentInfoBundlePacker().pack(paymentDataUi.paymentInfo))
+                intent.putExtra(TAcqIntentExtra.EXTRA_CARD_DATA, CardsArrayBundlePacker().pack(arrayOf(paymentDataUi.card)))
+                intent.putExtra(TAcqIntentExtra.EXTRA_PAYMENT_INFO, PaymentInfoBundlePacker().pack(paymentDataUi.paymentInfo))
             } else if (threeDsData != null) {
-                intent.putExtra(PayFormActivity.EXTRA_THREE_DS, ThreeDsBundlePacker().pack(threeDsData))
+                intent.putExtra(TAcqIntentExtra.EXTRA_THREE_DS, ThreeDsBundlePacker().pack(threeDsData))
             }
         }
         return this
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
index 3c048ea..6acb6c9 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
@@ -83,7 +83,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         .prepare(params.customerKey, settings.getCheckType(), settings.isCustomKeyboardEnabled(), params.customerEmail)
                         .setTheme(settings.resolveAttachCardStyle())
                         .setCameraCardScanner(settings.getCameraScanner())
-                        .setDesignConfiguration(AttachCellType.ATTACH_BUTTON, AttachCellType.SECURE_LOGOS, AttachCellType.PAYMENT_CARD_REQUISITES)
+//                        .setDesignConfiguration(AttachCellType.ATTACH_BUTTON, AttachCellType.SECURE_LOGOS, AttachCellType.PAYMENT_CARD_REQUISITES)
                         .startActivityForResult(this, ATTACH_CARD_REQUEST_CODE);
                 return true;
             case R.id.menu_action_about:
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
index 9db4079..99bd708 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
@@ -137,7 +137,7 @@ protected void initPayment(final Money amount,
                 //.setReceipt(createReceipt())
                 //.setData(createData())
                 .setTheme(settings.resolveStyle())
-                .setDesignConfiguration(PayCellType.PAYMENT_CARD_REQUISITES, PayCellType.PAY_BUTTON, PayCellType.SECURE_LOGOS)
+//                .setDesignConfiguration(PayCellType.PAYMENT_CARD_REQUISITES, PayCellType.PAY_BUTTON, PayCellType.SECURE_LOGOS)
                 .setGooglePayParams(settings.isGooglePayEnabled() ? googlePayParams : null)
                 .startActivityForResult(this, REQUEST_CODE_PAY);
     }
diff --git a/sample/src/main/res/values/style_custom.xml b/sample/src/main/res/values/style_custom.xml
index 77bbefa..702c88a 100644
--- a/sample/src/main/res/values/style_custom.xml
+++ b/sample/src/main/res/values/style_custom.xml
@@ -15,14 +15,10 @@
         <item name="acqPayEmailStyle">@style/AcquiringPayEmailStyle.Custom</item>
         <item name="acqPayAmountPosition">overFields</item>
         <item name="acqPayButtonAndIconPosition">iconsUnderFieldsButtonOnBottom</item>
-        <item name="acqPayFormTitle">@string/acq_screen_title_custom</item>
-        <item name="acqPayWithAmountFormat">@string/acq_pay_with_amount_custom</item>
-        <item name="acqMoneyAmountFormat">@string/acq_money_amount_format_custom</item>
         <item name="acqKeyboardStyle">@style/AcquiringKeyboardStyle.Custom</item>
     </style>
 
     <style name="AcquiringTheme.Custom.AttachCard">
-        <item name="acqPayFormTitle">@string/attachment_toolbar_title</item>
         <item name="acqPayAmountPosition">overFields</item>
         <item name="acqPayTitleStyle">@style/AcquiringPayTitleStyle.Custom.AttachCard</item>
         <item name="acqPayDescriptionStyle">@style/AcquiringPayDescriptionStyle.Custom.AttachCard</item>
@@ -30,7 +26,6 @@
     </style>
 
     <style name="AcquiringTheme.AttachCard">
-        <item name="acqPayFormTitle">@string/attachment_toolbar_title</item>
         <item name="acqPayAmountPosition">overFields</item>
         <item name="acqPayTitleStyle">@style/AcquiringPayTitleStyle.AttachCard</item>
         <item name="acqPayDescriptionStyle">@style/AcquiringPayDescriptionStyle.AttachCard</item>
diff --git a/ui/build.gradle b/ui/build.gradle
index 90b8f61..0907fd0 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     api("com.google.android.gms:play-services-wallet:11.6.2") {
         exclude module: 'support-v4'
     }
-
+    implementation "com.google.code.gson:gson:$gsonVersion"
     api project(':core')
 }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormActivity.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormActivity.java
index 082667b..50c3f71 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormActivity.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormActivity.java
@@ -9,37 +9,24 @@
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
-import android.util.TypedValue;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+
 /**
  * @author Vitaliy Markus
  */
 public class AttachCardFormActivity extends AppCompatActivity implements IAttachCardFormActivity {
 
     public static final int RESULT_ERROR = 500;
-    static final String EXTRA_ERROR = "error";
-
-    static final String EXTRA_TERMINAL_KEY = "terminal_key";
-    static final String EXTRA_PASSWORD = "password";
-    static final String EXTRA_PUBLIC_KEY = "public_key";
-
-    static final String EXTRA_CUSTOMER_KEY = "customer_key";
-    static final String EXTRA_CHECK_TYPE = "check_type";
-    static final String EXTRA_CUSTOM_KEYBOARD = "keyboard";
-    static final String EXTRA_DATA = "data";
-    static final String EXTRA_THEME = "theme";
-    static final String EXTRA_CAMERA_CARD_SCANNER = "card_scanner";
-    static final String EXTRA_CARD_ID = "card_id";
-    static final String EXTRA_EMAIL = "email";
-    static final String EXTRA_DESIGN_CONFIGURATION = "design_configuration";
 
     private DialogsManager dialogsManager;
     private AcquiringSdk sdk;
 
     private boolean useCustomKeyboard;
     private String cardId;
+    private AsdkLocalizationProperty asdkLocalization;
 
     public static AttachCardFormStarter init(String terminalKey, String password, String publicKey) {
         return new AttachCardFormStarter(terminalKey, password, publicKey);
@@ -47,23 +34,23 @@ public static AttachCardFormStarter init(String terminalKey, String password, St
 
     public static void dispatchResult(int resultCode, Intent data, OnAttachCardListener listener) {
         if (resultCode == RESULT_OK) {
-            listener.onSuccess(data.getStringExtra(AttachCardFormActivity.EXTRA_CARD_ID));
+            listener.onSuccess(data.getStringExtra(TAcqIntentExtra.EXTRA_CARD_ID));
         } else if (resultCode == RESULT_CANCELED) {
             listener.onCancelled();
         } else if (resultCode == RESULT_ERROR) {
-            listener.onError((Exception) data.getSerializableExtra(EXTRA_ERROR));
+            listener.onError((Exception) data.getSerializableExtra(TAcqIntentExtra.EXTRA_ERROR));
         }
     }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        asdkLocalization = new AsdkLocalizationProperty(this);
         Intent intent = getIntent();
         initActivity(intent);
         dialogsManager = new DialogsManager(this);
         sdk = createSdk(intent);
-        useCustomKeyboard = intent.getBooleanExtra(EXTRA_CUSTOM_KEYBOARD, false);
+        useCustomKeyboard = intent.getBooleanExtra(TAcqIntentExtra.EXTRA_CUSTOM_KEYBOARD, false);
 
         if (savedInstanceState == null) {
             addAttachCardFragment();
@@ -99,7 +86,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void success() {
         hideProgressDialog();
         Intent data = new Intent();
-        data.putExtra(EXTRA_CARD_ID, cardId);
+        data.putExtra(TAcqIntentExtra.EXTRA_CARD_ID, cardId);
         setResult(RESULT_OK, data);
         finish();
     }
@@ -112,7 +99,7 @@ public void cancel() {
 
     @Override
     public void showProgressDialog() {
-        dialogsManager.showProgressDialog(getString(R.string.acq_progress_dialog_attach_card_text));
+        dialogsManager.showProgressDialog(getAsdkLocalization().addCardDialogProgressAddCardMessage);
     }
 
     @Override
@@ -129,7 +116,7 @@ public void exception(Throwable throwable) {
         }
 
         Intent data = new Intent();
-        data.putExtra(EXTRA_ERROR, throwable);
+        data.putExtra(TAcqIntentExtra.EXTRA_ERROR, throwable);
         setResult(RESULT_ERROR, data);
         finish();
     }
@@ -150,15 +137,15 @@ public void start3DS(ThreeDsData data) {
     public void showErrorDialog(Exception e) {
         String message = e.getMessage();
         if (TextUtils.isEmpty(message)) {
-            message = getString(R.string.acq_default_error_message);
+            message = getAsdkLocalization().addCardDialogErrorFallbackMessage;
         }
-        dialogsManager.showErrorDialog(getString(R.string.acq_default_error_title), message);
+        dialogsManager.showErrorDialog(getAsdkLocalization().addCardDialogErrorTitle, message);
     }
 
     @Override
     public void noNetwork() {
-        String title = getString(R.string.acq_default_error_title);
-        String message = getString(R.string.acq_network_error_message);
+        String title = getAsdkLocalization().addCardDialogErrorTitle;
+        String message = getAsdkLocalization().addCardDialogErrorNetwork;
         DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -215,7 +202,7 @@ boolean shouldUseCustomKeyboard() {
     }
 
     private void initActivity(Intent intent) {
-        int theme = intent.getIntExtra(EXTRA_THEME, 0);
+        int theme = intent.getIntExtra(TAcqIntentExtra.EXTRA_THEME, 0);
         if (theme != 0) {
             setTheme(theme);
         }
@@ -224,16 +211,13 @@ private void initActivity(Intent intent) {
         setContentView(R.layout.acq_activity);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        TypedValue tv = new TypedValue();
-        getTheme().resolveAttribute(R.attr.acqPayFormTitle, tv, true);
-        String title = getResources().getString(tv.resourceId);
-        setTitle(title);
+        setTitle(getAsdkLocalization().addCardTitle);
     }
 
     private AcquiringSdk createSdk(Intent intent) {
-        String terminalKey = intent.getStringExtra(EXTRA_TERMINAL_KEY);
-        String password = intent.getStringExtra(EXTRA_PASSWORD);
-        String publicKey = intent.getStringExtra(EXTRA_PUBLIC_KEY);
+        String terminalKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY);
+        String password = intent.getStringExtra(TAcqIntentExtra.EXTRA_PASSWORD);
+        String publicKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_PUBLIC_KEY);
         return new AcquiringSdk(terminalKey, password, publicKey);
     }
 
@@ -252,4 +236,9 @@ private void addAttachCardFragment() {
                 .commit();
 
     }
+
+    @Override
+    public AsdkLocalization getAsdkLocalization() {
+        return asdkLocalization.getAsdkLocalization();
+    }
 }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormFragment.java
index 673ebf7..d8eaa48 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormFragment.java
@@ -24,6 +24,8 @@
 
 import ru.tinkoff.acquiring.sdk.inflate.attach.AttachCellInflater;
 import ru.tinkoff.acquiring.sdk.inflate.attach.AttachCellType;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
 import ru.tinkoff.acquiring.sdk.responses.AttachCardResponse;
 import ru.tinkoff.acquiring.sdk.views.BankKeyboard;
 import ru.tinkoff.acquiring.sdk.views.EditCardView;
@@ -71,7 +73,7 @@ public void onAttach(Context context) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        int[] intTypes = getActivity().getIntent().getIntArrayExtra(AttachCardFormActivity.EXTRA_DESIGN_CONFIGURATION);
+        int[] intTypes = getActivity().getIntent().getIntArrayExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION);
         AttachCellType[] cellTypes = AttachCellType.toPayCellTypeArray(intTypes);
         View root = AttachCellInflater.from(inflater, cellTypes).inflate(container);
         initViews(root);
@@ -79,7 +81,11 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         AttachCardFormActivity activity = (AttachCardFormActivity) getActivity();
         cardManager = new CardManager(activity.getSdk());
 
-        cardScanner = new FullCardScanner(this, (ICameraCardScanner) getActivity().getIntent().getSerializableExtra(AttachCardFormActivity.EXTRA_CAMERA_CARD_SCANNER));
+        cardScanner = new FullCardScanner(
+                this,
+                (ICameraCardScanner) getActivity().getIntent().getSerializableExtra(TAcqIntentExtra.EXTRA_CAMERA_CARD_SCANNER),
+                AsdkLocalizations.require(this).addCardNoScanProviders
+        );
         editCardView.setCardSystemIconsHolder(new ThemeCardLogoCache(getActivity()));
         editCardView.setActions(cardScanner);
         if (!cardScanner.isScanEnable()) {
@@ -96,7 +102,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         }
 
         resolveButtonAndIconsPosition(root);
-
+        attachButton.setText(AsdkLocalizations.require(this).addCardAddCardButton);
         attachButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -128,7 +134,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             ICreditCard card = cardScanner.parseNfcData(data);
             setCreditCardData(card);
         } else if (cardScanner.isNfcError(requestCode, resultCode)) {
-            Toast.makeText(getContext(), R.string.acq_nfc_scan_failed, Toast.LENGTH_SHORT).show();
+            Toast.makeText(getContext(), AsdkLocalizations.require(this).addCardNfcFail, Toast.LENGTH_SHORT).show();
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
@@ -167,9 +173,9 @@ private static void attachCard(final CardManager cardManager, final Intent inten
             @Override
             public void run() {
                 try {
-                    String customerKey = intent.getStringExtra(AttachCardFormActivity.EXTRA_CUSTOMER_KEY);
-                    String checkType = intent.getStringExtra(AttachCardFormActivity.EXTRA_CHECK_TYPE);
-                    Map<String, String> data = (Map<String, String>) intent.getSerializableExtra(AttachCardFormActivity.EXTRA_DATA);
+                    String customerKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY);
+                    String checkType = intent.getStringExtra(TAcqIntentExtra.EXTRA_CHECK_TYPE);
+                    Map<String, String> data = (Map<String, String>) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_DATA);
 
                     AttachCardResponse response = cardManager.attachCard(customerKey, checkType, cardData, email, data);
 
@@ -197,11 +203,17 @@ public void run() {
 
     private void initViews(View root) {
         editCardView = root.findViewById(R.id.ecv_card);
+        AsdkLocalization localization = AsdkLocalizations.require(this);
+        editCardView.setHints(
+            localization.payCardPanHint,
+            localization.payCardExpireDateHint,
+            localization.payCardCvcHint
+        );
         emailView = root.findViewById(R.id.et_email);
         attachButton = root.findViewById(R.id.btn_attach);
         customKeyboard = root.findViewById(R.id.acq_keyboard);
 
-        final String email = getActivity().getIntent().getStringExtra(AttachCardFormActivity.EXTRA_EMAIL);
+        final String email = getActivity().getIntent().getStringExtra(TAcqIntentExtra.EXTRA_E_MAIL);
         if (email != null && emailView != null) {
             emailView.setText(email);
         }
@@ -273,12 +285,13 @@ private String getEmail() {
     }
 
     private boolean validateInput(EditCardView cardView, String email) {
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         if (!cardView.isFilledAndCorrect()) {
-            Toast.makeText(getActivity(), R.string.acq_invalid_card, Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), localization.payDialogValidationInvalidCard, Toast.LENGTH_SHORT).show();
             return false;
         }
         if (!TextUtils.isEmpty(email) && !Patterns.EMAIL_ADDRESS.matcher(email).matches()) {
-            Toast.makeText(getActivity(), R.string.acq_invalid_email, Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), localization.payDialogValidationInvalidEmail, Toast.LENGTH_SHORT).show();
             return false;
         }
         return true;
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormStarter.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormStarter.java
index 327f73f..bf7b22c 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormStarter.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/AttachCardFormStarter.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.support.annotation.StyleRes;
 
+import java.io.ObjectOutputStream;
 import java.util.HashMap;
 
 import ru.tinkoff.acquiring.sdk.inflate.attach.AttachCellInflater;
@@ -32,40 +33,52 @@ public AttachCardFormStarter prepare(String customerKey, CheckType checkType, bo
 
     public AttachCardFormStarter prepare(String customerKey, String checkType, boolean customKeyboard, String email) {
         intent = new Intent();
-        intent.putExtra(AttachCardFormActivity.EXTRA_CUSTOMER_KEY, customerKey);
-        intent.putExtra(AttachCardFormActivity.EXTRA_CHECK_TYPE, checkType);
-        intent.putExtra(AttachCardFormActivity.EXTRA_CUSTOM_KEYBOARD, customKeyboard);
-        intent.putExtra(AttachCardFormActivity.EXTRA_EMAIL, email);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY, customerKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CHECK_TYPE, checkType);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CUSTOM_KEYBOARD, customKeyboard);
+        intent.putExtra(TAcqIntentExtra.EXTRA_E_MAIL, email);
 
-        intent.putExtra(AttachCardFormActivity.EXTRA_TERMINAL_KEY, terminalKey);
-        intent.putExtra(AttachCardFormActivity.EXTRA_PASSWORD, password);
-        intent.putExtra(AttachCardFormActivity.EXTRA_PUBLIC_KEY, publicKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY, terminalKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PASSWORD, password);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PUBLIC_KEY, publicKey);
 
-        intent.putExtra(AttachCardFormActivity.EXTRA_DESIGN_CONFIGURATION, AttachCellType.toIntArray(AttachCellInflater.DEFAULT_CELL_TYPES));
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION, AttachCellType.toIntArray(AttachCellInflater.DEFAULT_CELL_TYPES));
         return this;
     }
 
     public AttachCardFormStarter setData(HashMap<String, String> data) {
         checkIntent();
-        intent.putExtra(AttachCardFormActivity.EXTRA_DATA, data);
+        intent.putExtra(TAcqIntentExtra.EXTRA_DATA, data);
         return this;
     }
 
     public AttachCardFormStarter setTheme(@StyleRes int theme) {
         checkIntent();
-        intent.putExtra(AttachCardFormActivity.EXTRA_THEME, theme);
+        intent.putExtra(TAcqIntentExtra.EXTRA_THEME, theme);
         return this;
     }
 
     public AttachCardFormStarter setCameraCardScanner(ICameraCardScanner cameraCardScanner) {
         checkIntent();
-        intent.putExtra(AttachCardFormActivity.EXTRA_CAMERA_CARD_SCANNER, cameraCardScanner);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CAMERA_CARD_SCANNER, cameraCardScanner);
         return this;
     }
 
     public AttachCardFormStarter setDesignConfiguration(AttachCellType... types) {
         checkIntent();
-        intent.putExtra(AttachCardFormActivity.EXTRA_DESIGN_CONFIGURATION, AttachCellType.toIntArray(types));
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION, AttachCellType.toIntArray(types));
+        return this;
+    }
+
+    public AttachCardFormStarter setLanguage(Language language) {
+        checkIntent();
+        intent.putExtra(TAcqIntentExtra.EXTRA_LANGUAGE, language.ordinal());
+        return this;
+    }
+
+    public AttachCardFormStarter setRawLocalizationResourceId(int rawLocalizationResourceId) {
+        checkIntent();
+        intent.putExtra(TAcqIntentExtra.EXTRA_LOCALIZATION_RAW_RESOURCE_ID, rawLocalizationResourceId);
         return this;
     }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
index b686e75..3471fd2 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
@@ -37,6 +37,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
+
 /**
  * @author a.shishkin1
  */
@@ -53,7 +56,7 @@ public class CardListFragment extends Fragment implements AdapterView.OnItemClic
     public static CardListFragment newInstance(String customerKey, boolean chargeMode) {
         Bundle args = new Bundle();
         args.putString(EXTRA_CUSTOMER_KEY, customerKey);
-        args.putBoolean(PayFormActivity.EXTRA_CHARGE_MODE, chargeMode);
+        args.putBoolean(TAcqIntentExtra.EXTRA_CHARGE_MODE, chargeMode);
         CardListFragment fragment = new CardListFragment();
         fragment.setArguments(args);
         return fragment;
@@ -64,7 +67,7 @@ public static CardListFragment newInstance(String customerKey, boolean chargeMod
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.acq_fragment_card_list, container, false);
         lvCards = (ListView) view.findViewById(R.id.lv_cards);
-        adapter = new CardsAdapter(getActivity(), getArguments().getBoolean(PayFormActivity.EXTRA_CHARGE_MODE, false));
+        adapter = new CardsAdapter(getActivity(), getArguments().getBoolean(TAcqIntentExtra.EXTRA_CHARGE_MODE, false));
         lvCards.setAdapter(adapter);
         lvCards.setOnItemClickListener(this);
         lvCards.setOnItemLongClickListener(this);
@@ -135,11 +138,13 @@ private static class CardsAdapter extends BaseAdapter {
         private CardLogoCache cardLogoCache;
         private final boolean chargeMode;
         private int selectedItemPosition = NOT_SET;
+        private AsdkLocalization localization;
 
         public CardsAdapter(Activity context, boolean chargeMode) {
             this.context = context;
             this.chargeMode = chargeMode;
             this.cardLogoCache = new ThemeCardLogoCache(context);
+            localization = AsdkLocalizations.require(context);
         }
 
         @Override
@@ -208,6 +213,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             } else if (type == Item.NEW_CARD) {
                 if (convertView == null) {
                     convertView = LayoutInflater.from(context).inflate(R.layout.acq_item_new_card, parent, false);
+                    ((TextView)convertView.findViewById(R.id.acq_tv_new_card)).setText(localization.cardListNewCard);
                 }
                 return convertView;
             }
@@ -298,7 +304,10 @@ public void onDestroyActionMode(ActionMode mode) {
 
         @Override
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            mode.getMenuInflater().inflate(R.menu.menu_delete_card, menu);
+            menu
+                    .add(0, R.id.action_delete, 0,  AsdkLocalizations.require(CardListFragment.this).cardListDelete)
+                    .setIcon(R.drawable.acq_delete)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             return true;
         }
 
@@ -310,7 +319,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
 
             Card target = adapter.getSelectedItem();
             AcquiringSdk sdk = ((PayFormActivity) getActivity()).getSdk();
-            deleteCard(sdk, target, customerKey, getString(R.string.acq_cant_delete_card_message));
+            deleteCard(sdk, target, customerKey, AsdkLocalizations.require(CardListFragment.this).cardListRemoveCardFailMessage);
             mode.finish();
             return true;
         }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/DialogsManager.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/DialogsManager.java
index df1b593..d890ed2 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/DialogsManager.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/DialogsManager.java
@@ -21,6 +21,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 
+import ru.tinkoff.acquiring.sdk.localization.HasAsdkLocalization;
+
 /**
  * @author Mikhail Artemyev
  */
@@ -49,11 +51,16 @@ void showErrorDialog(final String title,
                          final DialogInterface.OnClickListener onClickListener) {
         dismissDialogs();
 
+        String msg = context.getString(android.R.string.ok);
+        if (context instanceof HasAsdkLocalization) {
+            msg = ((HasAsdkLocalization) context).getAsdkLocalization().payDialogErrorAcceptButton;
+        }
+
         messageDialog = new AlertDialog.Builder(context)
                 .setMessage(message)
                 .setTitle(title)
                 .setCancelable(false)
-                .setNeutralButton(R.string.acq_dialog_dismiss_btn, onClickListener)
+                .setNeutralButton(msg, onClickListener)
                 .create();
 
         messageDialog.show();
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
index d98e16f..8373539 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Message;
 import android.support.annotation.NonNull;
@@ -39,7 +38,6 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -67,6 +65,8 @@
 
 import ru.tinkoff.acquiring.sdk.inflate.pay.PayCellInflater;
 import ru.tinkoff.acquiring.sdk.inflate.pay.PayCellType;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
 import ru.tinkoff.acquiring.sdk.requests.InitRequestBuilder;
 import ru.tinkoff.acquiring.sdk.utils.Base64;
 import ru.tinkoff.acquiring.sdk.views.BankKeyboard;
@@ -128,41 +128,33 @@ public class EnterCardFragment extends Fragment implements ICardInterest, ICharg
     private RejectAction rejectAction;
 
     private boolean chargeMode;
-    private int amountPositionMode;
-    private int buttonAndIconsPositionMode;
-    private String payAmountFormat;
-    private String moneyAmountFormat;
     private PaymentInfo rejectedPaymentInfo;
 
     private PaymentsClient paymentsClient;
 
     public static EnterCardFragment newInstance(boolean chargeMode) {
         Bundle args = new Bundle();
-        args.putBoolean(PayFormActivity.EXTRA_CHARGE_MODE, chargeMode);
+        args.putBoolean(TAcqIntentExtra.EXTRA_CHARGE_MODE, chargeMode);
         EnterCardFragment fragment = new EnterCardFragment();
         fragment.setArguments(args);
         return fragment;
     }
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        TypedArray typedArray = context.getTheme().obtainStyledAttributes(new int[]{R.attr.acqPayAmountPosition, R.attr.acqPayButtonAndIconPosition, R.attr.acqPayWithAmountFormat, R.attr.acqMoneyAmountFormat});
-        amountPositionMode = typedArray.getInt(AMOUNT_POSITION_INDEX, AMOUNT_POSITION_OVER_FIELDS);
-        buttonAndIconsPositionMode = typedArray.getInt(BUTTON_POSITION_INDEX, BUTTON_UNDER_FIELDS_ICONS_ON_BOTTOM);
-        payAmountFormat = typedArray.getString(PAY_WITH_AMOUNT_FORMAT_INDEX);
-        moneyAmountFormat = typedArray.getString(MONEY_AMOUNT_FORMAT_INDEX);
-        typedArray.recycle();
-    }
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        int[] intTypes = getActivity().getIntent().getIntArrayExtra(PayFormActivity.EXTRA_DESIGN_CONFIGURATION);
+        int[] intTypes = getActivity().getIntent().getIntArrayExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION);
         PayCellType[] cellTypes = PayCellType.toPayCellTypeArray(intTypes);
         View view = PayCellInflater.from(inflater, cellTypes).inflate(container);
 
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         ecvCard = view.findViewById(R.id.ecv_card);
+        ecvCard.setHints(
+                localization.payCardPanHint,
+                localization.payCardExpireDateHint,
+                localization.payCardCvcHint
+        );
 
         tvSrcCardLabel = view.findViewById(R.id.tv_src_card_label);
         tvDescription = view.findViewById(R.id.tv_description);
@@ -170,6 +162,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         tvAmount = view.findViewById(R.id.tv_amount);
         tvChooseCardButton = view.findViewById(R.id.tv_src_card_choose_btn);
         btnPay = view.findViewById(R.id.btn_pay);
+        btnPay.setText(AsdkLocalizations.require(this).payPayButton);
         btnGooglePay = view.findViewById(R.id.rl_google_play_button);
         if (btnGooglePay != null) {
             btnGooglePay.setEnabled(false);
@@ -179,7 +172,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         etEmail = view.findViewById(R.id.et_email);
 
         final FragmentActivity activity = getActivity();
-        cardScanner = new FullCardScanner(this, (ICameraCardScanner) activity.getIntent().getSerializableExtra(PayFormActivity.EXTRA_CAMERA_CARD_SCANNER));
+        cardScanner = new FullCardScanner(
+                this,
+                (ICameraCardScanner) activity.getIntent().getSerializableExtra(TAcqIntentExtra.EXTRA_CAMERA_CARD_SCANNER),
+                AsdkLocalizations.require(this).payNoScanProviders
+        );
         ecvCard.setCardSystemIconsHolder(new ThemeCardLogoCache(activity));
         ecvCard.setActions(cardScanner);
         if (!cardScanner.isScanEnable()) {
@@ -188,7 +185,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         customKeyboard = view.findViewById(R.id.acq_keyboard);
 
-        googlePayParams = activity.getIntent().getParcelableExtra(PayFormActivity.EXTRA_ANDROID_PAY_PARAMS);
+        googlePayParams = activity.getIntent().getParcelableExtra(TAcqIntentExtra.EXTRA_ANDROID_PAY_PARAMS);
         boolean isUsingCustomKeyboard = ((PayFormActivity) activity).shouldUseCustomKeyboard();
         if (isUsingCustomKeyboard) {
 
@@ -213,21 +210,12 @@ public void onClick(View v) {
 
         srcCardChooser.setVisibility(View.GONE);
 
-        chargeMode = getArguments().getBoolean(PayFormActivity.EXTRA_CHARGE_MODE);
+        chargeMode = getArguments().getBoolean(TAcqIntentExtra.EXTRA_CHARGE_MODE);
         if (chargeMode) {
             setRecurrentModeForCardView(true);
             ecvCard.setRecurrentPaymentMode(true);
         }
 
-        if (amountPositionMode != AMOUNT_POSITION_OVER_FIELDS) {
-            View amountLayout = view.findViewById(R.id.ll_price_layout);
-            if (amountLayout != null) {
-                amountLayout.setVisibility(View.GONE);
-            }
-        }
-
-        resolveButtonAndIconsPosition(view);
-
         return view;
     }
 
@@ -238,38 +226,31 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
         final Intent intent = getActivity().getIntent();
 
-        final String email = intent.getStringExtra(PayFormActivity.EXTRA_E_MAIL);
+        final String email = intent.getStringExtra(TAcqIntentExtra.EXTRA_E_MAIL);
         if (email != null && etEmail != null) {
             etEmail.setText(email);
         }
 
-        final String title = intent.getStringExtra(PayFormActivity.EXTRA_TITLE);
+        final String title = intent.getStringExtra(TAcqIntentExtra.EXTRA_TITLE);
         if (tvTitle != null) {
             tvTitle.setText(title);
         }
 
-        String description = intent.getStringExtra(PayFormActivity.EXTRA_DESCRIPTION);
+        String description = intent.getStringExtra(TAcqIntentExtra.EXTRA_DESCRIPTION);
         if (tvDescription != null) {
             tvDescription.setText(description);
         }
 
-        final Money amount = (Money) intent.getSerializableExtra(PayFormActivity.EXTRA_AMOUNT);
+        final Money amount = (Money) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_AMOUNT);
 
         String amountTextWithRubbles = amount != null ? amount.toHumanReadableString() : "";
-        String amountText = amount != null ? amount.toString() : "";
+        String amountText = amount != null ? amount.toString() : ""; /* TODO*/
 
-        if (amountPositionMode == AMOUNT_POSITION_OVER_FIELDS && tvAmount != null) {
-            if (TextUtils.isEmpty(moneyAmountFormat)) {
-                tvAmount.setText(amountTextWithRubbles);
-            } else {
-                tvAmount.setText(String.format(moneyAmountFormat, amountText));
-            }
-        } else if (TextUtils.isEmpty(payAmountFormat)) {
-            String text = btnPay.getText().toString();
-            btnPay.setText(text + " " + amountTextWithRubbles);
-        } else {
-            btnPay.setText(String.format(payAmountFormat, amountText));
+        AsdkLocalization localization = AsdkLocalizations.require(this);
+        if (tvAmount != null) {
+            tvAmount.setText(localization.payMoneyAmount);
         }
+        btnPay.setText(localization.payPayButton);
 
         btnPay.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -416,7 +397,7 @@ private void hideGooglePayButton() {
     private PaymentDataRequest createPaymentDataRequest() {
         Intent intent = getActivity().getIntent();
 
-        String description = intent.getStringExtra(PayFormActivity.EXTRA_DESCRIPTION);
+        String description = intent.getStringExtra(TAcqIntentExtra.EXTRA_DESCRIPTION);
         String price = getFormattedPrice();
 
         TransactionInfo transactionInfo = TransactionInfo.newBuilder()
@@ -452,7 +433,7 @@ private PaymentDataRequest createPaymentDataRequest() {
 
     private String getFormattedPrice() {
         Intent intent = getActivity().getIntent();
-        Money money = (Money) intent.getSerializableExtra(PayFormActivity.EXTRA_AMOUNT);
+        Money money = (Money) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_AMOUNT);
         BigDecimal bigDecimal = new BigDecimal(money.getCoins());
         bigDecimal = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_EVEN);
         return bigDecimal.toString();
@@ -460,11 +441,12 @@ private String getFormattedPrice() {
 
     private void setRecurrentModeForCardView(boolean recurrentMode) {
         if (recurrentMode) {
+            AsdkLocalization localization = AsdkLocalizations.require(this);
             ecvCard.setEnabled(false);
             ecvCard.setFocusable(false);
             ecvCard.clearFocus();
             ecvCard.setFullCardNumberModeEnable(false);
-            ecvCard.setCardHint(getString(R.string.acq_recurrent_mode_card_hint));
+            ecvCard.setCardHint(localization.payCardPanHintRecurrent);
         } else {
             ecvCard.setEnabled(true);
             ecvCard.setFocusable(true);
@@ -473,71 +455,16 @@ private void setRecurrentModeForCardView(boolean recurrentMode) {
         }
     }
 
-    private void resolveButtonAndIconsPosition(View root) {
-        LinearLayout containerLayout = (LinearLayout) root.findViewById(R.id.ll_container_layout);
-        View buttons = root.findViewById(R.id.pay_buttons_layout);
-        View space = root.findViewById(R.id.space);
-        View secureIcons = root.findViewById(R.id.iv_secure_icons);
-        switch (buttonAndIconsPositionMode) {
-            case BUTTON_UNDER_FIELDS_ICONS_ON_BOTTOM:
-                break;
-            case ICONS_ON_BOTTOM_BUTTON_UNDER_ICONS:
-                containerLayout.removeView(buttons);
-                containerLayout.addView(buttons);
-                break;
-            case ICONS_UNDER_FIELDS_BUTTON_ON_BOTTOM:
-                containerLayout.removeView(secureIcons);
-                removeSpace(containerLayout, space);
-                containerLayout.removeView(buttons);
-                containerLayout.addView(secureIcons);
-                addSpace(containerLayout, space);
-                containerLayout.addView(buttons);
-                break;
-            case ICONS_UNDER_FIELDS_BUTTON_UNDER_ICONS:
-                containerLayout.removeView(secureIcons);
-                removeSpace(containerLayout, space);
-                containerLayout.removeView(buttons);
-                containerLayout.addView(secureIcons);
-                containerLayout.addView(buttons);
-                break;
-            case BUTTON_UNDER_FIELDS_ICONS_UNDER_BOTTOM:
-                removeSpace(containerLayout, space);
-                break;
-        }
-    }
-
-    private void addSpace(ViewGroup container, View space) {
-        if (space != null) {
-            container.addView(space);
-        }
-    }
-
-    private void removeSpace(ViewGroup container, View space) {
-        if (space != null) {
-            container.removeView(space);
-        }
-    }
-
-    private Language resolveLanguage() {
-        Locale locale = getResources().getConfiguration().locale;
-        String language = locale.getLanguage();
-
-        if (language != null && language.toLowerCase().startsWith("ru")) {
-            return null;
-        } else {
-            return Language.ENGLISH;
-        }
-    }
-
     private boolean validateInput(EditCardView cardView, String enteredEmail) {
-        int errorMessage = 0;
+        String errorMessage = null;
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         if (!cardView.isFilledAndCorrect()) {
-            errorMessage = R.string.acq_invalid_card;
+            errorMessage = localization.payDialogValidationInvalidCard;
         } else if (!isEmailValid(enteredEmail)) {
-            errorMessage = R.string.acq_invalid_email;
+            errorMessage = localization.payDialogValidationInvalidEmail;
         }
 
-        if (errorMessage != 0) {
+        if (errorMessage != null) {
             makeText(getActivity(), errorMessage, Toast.LENGTH_SHORT).show();
             return false;
         }
@@ -550,19 +477,19 @@ private boolean isEmailValid(String email) {
     }
 
     private InitRequestBuilder createInitRequestBuilder(Intent intent) {
-        final String password = intent.getStringExtra(PayFormActivity.EXTRA_PASSWORD);
-        final String terminalKey = intent.getStringExtra(PayFormActivity.EXTRA_TERMINAL_KEY);
+        final String password = intent.getStringExtra(TAcqIntentExtra.EXTRA_PASSWORD);
+        final String terminalKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY);
 
         final InitRequestBuilder builder = new InitRequestBuilder(password, terminalKey);
 
-        final String orderId = intent.getStringExtra(PayFormActivity.EXTRA_ORDER_ID);
-        final String customerKey = intent.getStringExtra(PayFormActivity.EXTRA_CUSTOMER_KEY);
-        String title = intent.getStringExtra(PayFormActivity.EXTRA_TITLE);
+        final String orderId = intent.getStringExtra(TAcqIntentExtra.EXTRA_ORDER_ID);
+        final String customerKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY);
+        String title = intent.getStringExtra(TAcqIntentExtra.EXTRA_TITLE);
         if (title != null && title.length() > PAY_FORM_MAX_LENGTH) {
             title = title.substring(0, PAY_FORM_MAX_LENGTH);
         }
-        final Money amount = (Money) intent.getSerializableExtra(PayFormActivity.EXTRA_AMOUNT);
-        final boolean recurrentPayment = intent.getBooleanExtra(PayFormActivity.EXTRA_RECURRENT_PAYMENT, false);
+        final Money amount = (Money) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_AMOUNT);
+        final boolean recurrentPayment = intent.getBooleanExtra(TAcqIntentExtra.EXTRA_RECURRENT_PAYMENT, false);
 
         builder.setOrderId(orderId)
                 .setCustomerKey(customerKey)
@@ -570,17 +497,17 @@ private InitRequestBuilder createInitRequestBuilder(Intent intent) {
                 .setAmount(amount.getCoins())
                 .setRecurrent(recurrentPayment);
 
-        final Language language = resolveLanguage();
+        final Language language = AsdkLocalizations.resolveLanguageByCurrentLocale(requireActivity()) == Language.ENGLISH ? Language.ENGLISH : null;
         if (language != null) {
             builder.setLanguage(language.toString());
         }
 
-        final Receipt receiptValue = (Receipt) intent.getSerializableExtra(PayFormActivity.EXTRA_RECEIPT_VALUE);
+        final Receipt receiptValue = (Receipt) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_RECEIPT_VALUE);
         if (receiptValue != null) {
             builder.setReceipt(receiptValue);
         }
 
-        final Map<String, String> dataValue = (Map<String, String>) intent.getSerializableExtra(PayFormActivity.EXTRA_DATA_VALUE);
+        final Map<String, String> dataValue = (Map<String, String>) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_DATA_VALUE);
         if (dataValue != null) {
             builder.setData(dataValue);
         }
@@ -631,7 +558,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             ICreditCard card = cardScanner.parseNfcData(data);
             setCreditCardData(card);
         } else if (cardScanner.isNfcError(requestCode, resultCode)) {
-            Toast.makeText(getContext(), R.string.acq_nfc_scan_failed, Toast.LENGTH_SHORT).show();
+            AsdkLocalization localization = AsdkLocalizations.require(this);
+            Toast.makeText(getContext(), localization.payNfcFail, Toast.LENGTH_SHORT).show();
         } else {
             if (resultCode == Activity.RESULT_OK && (requestCode == LOAD_PAYMENT_DATA_REQUEST_CODE)) {
                 ((PayFormActivity) getActivity()).showProgressDialog();
@@ -659,7 +587,7 @@ private void initGooglePayRequest(Intent data) {
 
         final String enteredEmail = getEmail();
         if (!isEmailValid(enteredEmail)) {
-            makeText(getActivity(), R.string.acq_invalid_email, Toast.LENGTH_SHORT).show();
+            makeText(getActivity(), AsdkLocalizations.require(this).payDialogValidationInvalidEmail, Toast.LENGTH_SHORT).show();
             return;
         }
 
@@ -781,9 +709,10 @@ public void onChargeRequestRejected(PaymentInfo paymentInfo) {
             activity.selectCardById(paymentInfo.getCardId());
         }
 
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setTitle(R.string.acq_complete_payment)
-                .setPositiveButton(R.string.acq_complete_payment_ok, new DialogInterface.OnClickListener() {
+        builder.setTitle(localization.payDialogCvcMessage)
+                .setPositiveButton(localization.payDialogCvcAcceptButton, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Card selectedCard = activity.getSourceCard();
@@ -820,12 +749,13 @@ private boolean needClearCardView(PayFormActivity activity) {
     }
 
     private String getLabel(boolean chargeMode, boolean hasCard) {
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         if (hasCard) {
-            return getString(R.string.acq_saved_card_label);
+            return localization.payCardSavedCard;
         } else if (chargeMode) {
             return "";
         } else {
-            return getString(R.string.acq_new_card_label);
+            return localization.payCardNewCard;
         }
     }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
index d31beda..1bd453d 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
@@ -10,6 +10,9 @@
 import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
+import ru.tinkoff.acquiring.sdk.localization.HasAsdkLocalization;
 import ru.tinkoff.acquiring.sdk.nfc.AsdkNfcScanActivity;
 import ru.tinkoff.acquiring.sdk.views.EditCardView;
 
@@ -23,11 +26,14 @@ public class FullCardScanner implements EditCardView.Actions {
     @NonNull
     private final Fragment fragment;
 
+    private String noScanProvidersMessage;
+
     @Nullable
     private final ICameraCardScanner cameraCardScanner;
 
-    public FullCardScanner(@NonNull Fragment fragment, @Nullable ICameraCardScanner cameraCardScanner) {
+    public FullCardScanner(@NonNull Fragment fragment, @Nullable ICameraCardScanner cameraCardScanner, String noScanProvidersMessage) {
         this.fragment = fragment;
+        this.noScanProvidersMessage = noScanProvidersMessage;
         if (cameraCardScanner != null) {
             this.cameraCardScanner = cameraCardScanner;
         } else {
@@ -42,7 +48,11 @@ public void onPressScanCard(EditCardView editCardView) {
         boolean cameraEnabled = isCameraEnable();
         if (nfcEnable && cameraEnabled) {
             AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-            CharSequence items[] = activity.getResources().getStringArray(R.array.acq_scan_types);
+            AsdkLocalization localization = ((HasAsdkLocalization) editCardView.getContext()).getAsdkLocalization();
+            CharSequence items[] = new CharSequence[] {
+                    localization.payDialogCardScanCamera,
+                    localization.payDialogCardScanNfc
+            };
             builder.setItems(items, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int i) {
@@ -60,7 +70,7 @@ public void onClick(DialogInterface dialog, int i) {
         } else if (nfcEnable) {
             startNfcScan(activity);
         } else {
-            Toast.makeText(activity, R.string.acq_no_scan_providers, Toast.LENGTH_SHORT).show();
+            Toast.makeText(activity, noScanProvidersMessage, Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/IBaseSdkActivity.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/IBaseSdkActivity.java
index 9d0f8af..6090c21 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/IBaseSdkActivity.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/IBaseSdkActivity.java
@@ -1,9 +1,11 @@
 package ru.tinkoff.acquiring.sdk;
 
+import ru.tinkoff.acquiring.sdk.localization.HasAsdkLocalization;
+
 /**
  * @author Vitaliy Markus
  */
-public interface IBaseSdkActivity {
+public interface IBaseSdkActivity extends HasAsdkLocalization {
 
     void success();
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
index a019ebe..6615e11 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
@@ -11,10 +11,14 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.math.BigDecimal;
 
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
+
 /**
  * @author Vitaliy Markus
  */
@@ -52,6 +56,10 @@ public void onAttach(Context context) {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.acq_fragment_loop_confirmation, container, false);
+        AsdkLocalization localization = AsdkLocalizations.require(this);
+        ((TextView) root.findViewById(R.id.tv_title)).setText(localization.confirmationLoopTitle);
+        ((TextView) root.findViewById(R.id.et_amount)).setText(localization.confirmationLoopDescription);
+        ((TextView) root.findViewById(R.id.btn_check)).setText(localization.confirmationLoopCheckButton);
         initViews(root);
         resolveButtonAndIconsPosition(root);
         return root;
@@ -73,7 +81,7 @@ public void onClick(View v) {
                     String value = MoneyUtils.normalize(amountView.getText().toString());
                     amount = Money.ofRubles(new BigDecimal(value)).getCoins();
                 } catch (Exception e) {
-                    Toast.makeText(activity, R.string.acq_attaching_card_loop_parse_error, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(activity, AsdkLocalizations.require(LoopConfirmationFragment.this).confirmationLoopDialogValidationInvalidAmount, Toast.LENGTH_SHORT).show();
                     return;
                 }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormActivity.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormActivity.java
index 464ffdc..156c67e 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormActivity.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormActivity.java
@@ -18,16 +18,15 @@
 
 
 import android.app.Activity;
-import android.app.FragmentManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
-import android.util.TypedValue;
 import android.view.MenuItem;
 import android.widget.Toast;
 
@@ -35,6 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
 import ru.tinkoff.acquiring.sdk.responses.AcquiringResponse;
 
 
@@ -49,34 +49,6 @@ public class PayFormActivity extends AppCompatActivity implements FragmentsCommu
     public static final int RESULT_ERROR = 500;
     public static final String API_ERROR_NO_CUSTOMER = "7";
 
-    static final String EXTRA_ERROR = "error";
-
-    static final String EXTRA_TERMINAL_KEY = "terminal_key";
-    static final String EXTRA_PASSWORD = "password";
-    static final String EXTRA_PUBLIC_KEY = "public_key";
-
-    static final String EXTRA_ORDER_ID = "order_id";
-    static final String EXTRA_AMOUNT = "amount";
-    static final String EXTRA_TITLE = "title";
-    static final String EXTRA_DESCRIPTION = "description";
-    static final String EXTRA_CARD_ID = "card_id";
-    static final String EXTRA_E_MAIL = "email";
-    static final String EXTRA_CUSTOM_KEYBOARD = "keyboard";
-    static final String EXTRA_CUSTOMER_KEY = "customer_key";
-    static final String EXTRA_RECURRENT_PAYMENT = "recurrent_payment";
-    static final String EXTRA_PAYMENT_ID = "payment_id";
-    static final String EXTRA_RECEIPT_VALUE = "receipt_value";
-    static final String EXTRA_DATA_VALUE = "data_value";
-    static final String EXTRA_CHARGE_MODE = "charge_mode";
-    static final String EXTRA_USE_FIRST_ATTACHED_CARD = "use_first_saved_card";
-    static final String EXTRA_THEME = "theme";
-    static final String EXTRA_CAMERA_CARD_SCANNER = "card_scanner";
-    static final String EXTRA_DESIGN_CONFIGURATION = "design_configuration";
-    static final String EXTRA_ANDROID_PAY_PARAMS = "android_pay_params";
-    public static final String EXTRA_CARD_DATA = "extra_card_data";
-    public static final String EXTRA_PAYMENT_INFO = "extra_payment_info";
-    public static final String EXTRA_THREE_DS = "extra_three_ds";
-
     static final int RESULT_CODE_CLEAR_CARD = 101;
 
     private static final String INSTANCE_KEY_CARDS = "cards";
@@ -97,6 +69,7 @@ public static PayFormStarter init(String terminalKey, String password, String pu
     private boolean useCustomKeyboard;
     private boolean isCardsReady;
     private boolean chargeMode;
+    private AsdkLocalizationProperty asdkLocalizationProperty;
 
     @Override
     public AcquiringSdk getSdk() {
@@ -130,9 +103,9 @@ public PayFormActivity() {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        asdkLocalizationProperty = new AsdkLocalizationProperty(this);
         Intent intent = getIntent();
-        int theme = intent.getIntExtra(EXTRA_THEME, 0);
+        int theme = intent.getIntExtra(TAcqIntentExtra.EXTRA_THEME, 0);
         if (theme != 0) {
             setTheme(theme);
         }
@@ -143,32 +116,29 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.acq_activity);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        TypedValue tv = new TypedValue();
-        getTheme().resolveAttribute(R.attr.acqPayFormTitle, tv, true);
-        String title = getResources().getString(tv.resourceId);
-        setTitle(title);
+        setTitle(getAsdkLocalization().payTitle);
 
         dialogsManager = new DialogsManager(this);
 
-        String terminalKey = intent.getStringExtra(EXTRA_TERMINAL_KEY);
-        String password = intent.getStringExtra(EXTRA_PASSWORD);
-        String publicKey = intent.getStringExtra(EXTRA_PUBLIC_KEY);
-        chargeMode = intent.getBooleanExtra(EXTRA_CHARGE_MODE, false);
+        String terminalKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY);
+        String password = intent.getStringExtra(TAcqIntentExtra.EXTRA_PASSWORD);
+        String publicKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_PUBLIC_KEY);
+        chargeMode = intent.getBooleanExtra(TAcqIntentExtra.EXTRA_CHARGE_MODE, false);
 
         sdk = new AcquiringSdk(terminalKey, password, publicKey);
         cardManager = new CardManager(sdk);
-        useCustomKeyboard = intent.getBooleanExtra(EXTRA_CUSTOM_KEYBOARD, false);
+        useCustomKeyboard = intent.getBooleanExtra(TAcqIntentExtra.EXTRA_CUSTOM_KEYBOARD, false);
 
         if (savedInstanceState == null) {
             isCardsReady = false;
-            if (intent.hasExtra(EXTRA_PAYMENT_INFO)) {
+            if (intent.hasExtra(TAcqIntentExtra.EXTRA_PAYMENT_INFO)) {
                 showRejected();
-            } else if (intent.hasExtra(EXTRA_THREE_DS)) {
+            } else if (intent.hasExtra(TAcqIntentExtra.EXTRA_THREE_DS)) {
                 showThreeDsData();
             } else {
                 startFinishAuthorized();
                 if (isCardChooseEnable()) {
-                    String customerKey = intent.getStringExtra(EXTRA_CUSTOMER_KEY);
+                    String customerKey = intent.getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY);
                     showProgressDialog();
                     requestCards(customerKey, cardManager);
                 }
@@ -183,8 +153,8 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void showRejected() {
-        Bundle paymentInfoBundle = getIntent().getBundleExtra(EXTRA_PAYMENT_INFO);
-        Bundle cardInfoBundle = getIntent().getBundleExtra(EXTRA_CARD_DATA);
+        Bundle paymentInfoBundle = getIntent().getBundleExtra(TAcqIntentExtra.EXTRA_PAYMENT_INFO);
+        Bundle cardInfoBundle = getIntent().getBundleExtra(TAcqIntentExtra.EXTRA_CARD_DATA);
         Card[] cards = new CardsArrayBundlePacker().unpack(cardInfoBundle);
         final PaymentInfo paymentInfo = new PaymentInfoBundlePacker().unpack(paymentInfoBundle);
 
@@ -206,7 +176,7 @@ public void onPerformReject() {
     }
 
     private void showThreeDsData() {
-        Bundle threeDsBundle = getIntent().getBundleExtra(EXTRA_THREE_DS);
+        Bundle threeDsBundle = getIntent().getBundleExtra(TAcqIntentExtra.EXTRA_THREE_DS);
         ThreeDsData threeDsData = new ThreeDsBundlePacker().unpack(threeDsBundle);
         start3DS(threeDsData);
     }
@@ -264,10 +234,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void success() {
         hideProgressDialog();
         final Intent data = new Intent();
-        data.putExtra(EXTRA_PAYMENT_ID, paymentId);
+        data.putExtra(TAcqIntentExtra.EXTRA_PAYMENT_ID, paymentId);
         setResult(RESULT_OK, data);
         if (isCardChooseEnable()) {
-            cardManager.clear(getIntent().getStringExtra(EXTRA_CUSTOMER_KEY));
+            cardManager.clear(getIntent().getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY));
         }
         finish();
     }
@@ -281,7 +251,7 @@ public void cancel() {
     @Override
     public void showProgressDialog() {
         if (!dialogsManager.isProgressShowing()) {
-            dialogsManager.showProgressDialog(getString(R.string.acq_progress_dialog_text));
+            dialogsManager.showProgressDialog(getAsdkLocalization().payDialogProgressPayMessage);
         }
     }
 
@@ -299,7 +269,7 @@ public void exception(Throwable throwable) {
         }
 
         Intent data = new Intent();
-        data.putExtra(EXTRA_ERROR, throwable);
+        data.putExtra(TAcqIntentExtra.EXTRA_ERROR, throwable);
         setResult(RESULT_ERROR, data);
         finish();
     }
@@ -317,15 +287,15 @@ public void start3DS(ThreeDsData data) {
     public void showErrorDialog(Exception exception) {
         String message = exception.getMessage();
         if (TextUtils.isEmpty(message)) {
-            message = getString(R.string.acq_default_error_message);
+            message = getAsdkLocalization().payDialogErrorFallbackMessage;
         }
-        dialogsManager.showErrorDialog(getString(R.string.acq_default_error_title), message);
+        dialogsManager.showErrorDialog(getAsdkLocalization().payDialogErrorTitle, message);
     }
 
     @Override
     public void noNetwork() {
-        String title = getString(R.string.acq_default_error_title);
-        String message = getString(R.string.acq_network_error_message);
+        String title = getAsdkLocalization().payDialogErrorTitle;
+        String message = getAsdkLocalization().payDialogErrorNetwork;
         DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -340,10 +310,10 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onCardsReady(Card[] cards) {
         hideProgressDialog();
-        boolean useFirstAttachedCard = getIntent().getBooleanExtra(EXTRA_USE_FIRST_ATTACHED_CARD, true);
+        boolean useFirstAttachedCard = getIntent().getBooleanExtra(TAcqIntentExtra.EXTRA_USE_FIRST_ATTACHED_CARD, true);
         this.cards = filterCards(cards);
         if (!isCardsReady && sourceCard == null && cards != null && cards.length > 0) {
-            String cardId = getIntent().getStringExtra(EXTRA_CARD_ID);
+            String cardId = getIntent().getStringExtra(TAcqIntentExtra.EXTRA_CARD_ID);
             if (cardId != null) {
                 sourceCard = cardManager.getCardById(cardId);
             }
@@ -360,7 +330,7 @@ public void onCardsReady(Card[] cards) {
 
     @Override
     public void onDeleteCard(Card card) {
-        cardManager.clear(getIntent().getStringExtra(EXTRA_CUSTOMER_KEY));
+        cardManager.clear(getIntent().getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY));
         if (sourceCard == card) {
             sourceCard = null;
         }
@@ -393,8 +363,8 @@ public void onChargeRequestRejected(PaymentInfo paymentInfo) {
     @Override
     public void onGooglePayError() {
         hideProgressDialog();
-        String title = getString(R.string.acq_default_error_title);
-        String message = getString(R.string.acq_default_error_message);
+        String title = getAsdkLocalization().payDialogErrorTitle;
+        String message = getAsdkLocalization().payDialogErrorFallbackMessage;
         dialogsManager.showErrorDialog(title, message);
     }
 
@@ -444,7 +414,7 @@ void startFinishAuthorized() {
     }
 
     void startChooseCard() {
-        Fragment fragment = createCardListFragment(getIntent().getStringExtra(EXTRA_CUSTOMER_KEY), chargeMode);
+        Fragment fragment = createCardListFragment(getIntent().getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY), chargeMode);
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.content_frame, fragment)
                 .addToBackStack("choose_card")
@@ -486,7 +456,7 @@ public void run() {
     }
 
     public boolean isCardChooseEnable() {
-        return getIntent().getStringExtra(EXTRA_CUSTOMER_KEY) != null;
+        return getIntent().getStringExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY) != null;
     }
 
     private void navigateBack() {
@@ -498,11 +468,11 @@ private void navigateBack() {
 
     public static void dispatchResult(int resultCode, Intent data, OnPaymentListener listener) {
         if (resultCode == RESULT_OK) {
-            listener.onSuccess(data.getLongExtra(EXTRA_PAYMENT_ID, -1L));
+            listener.onSuccess(data.getLongExtra(TAcqIntentExtra.EXTRA_PAYMENT_ID, -1L));
         } else if (resultCode == RESULT_CANCELED) {
             listener.onCancelled();
         } else if (resultCode == RESULT_ERROR) {
-            listener.onError((Exception) data.getSerializableExtra(EXTRA_ERROR));
+            listener.onError((Exception) data.getSerializableExtra(TAcqIntentExtra.EXTRA_ERROR));
         }
     }
 
@@ -520,9 +490,8 @@ private Card[] filterCards(@NonNull Card[] cards) {
         return list.toArray(new Card[list.size()]);
     }
 
-    public void showGooglePayError() {
-        String title = getString(R.string.acq_default_error_title);
-        String message = getString(R.string.acq_default_error_message);
-        dialogsManager.showErrorDialog(title, message);
+    @Override
+    public AsdkLocalization getAsdkLocalization() {
+        return asdkLocalizationProperty.getAsdkLocalization();
     }
 }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormStarter.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormStarter.java
index b7f1a8d..5c4d596 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormStarter.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/PayFormStarter.java
@@ -45,84 +45,96 @@ public PayFormStarter(String terminalKey, String password, String publicKey) {
 
     public PayFormStarter prepare(String orderId, Money amount, String title, String description, String cardId, String email, boolean recurrentPayment, boolean customKeyboard) {
         intent = new Intent();
-        intent.putExtra(PayFormActivity.EXTRA_ORDER_ID, orderId);
-        intent.putExtra(PayFormActivity.EXTRA_AMOUNT, amount);
-        intent.putExtra(PayFormActivity.EXTRA_TITLE, title);
-        intent.putExtra(PayFormActivity.EXTRA_DESCRIPTION, description);
-        intent.putExtra(PayFormActivity.EXTRA_CARD_ID, cardId);
-        intent.putExtra(PayFormActivity.EXTRA_E_MAIL, email);
-        intent.putExtra(PayFormActivity.EXTRA_CUSTOM_KEYBOARD, customKeyboard);
-        intent.putExtra(PayFormActivity.EXTRA_RECURRENT_PAYMENT, recurrentPayment);
-        intent.putExtra(PayFormActivity.EXTRA_TERMINAL_KEY, terminalKey);
-        intent.putExtra(PayFormActivity.EXTRA_PASSWORD, password);
-        intent.putExtra(PayFormActivity.EXTRA_PUBLIC_KEY, publicKey);
-        intent.putExtra(PayFormActivity.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(PayCellInflater.DEFAULT_CELL_TYPES));
+        intent.putExtra(TAcqIntentExtra.EXTRA_ORDER_ID, orderId);
+        intent.putExtra(TAcqIntentExtra.EXTRA_AMOUNT, amount);
+        intent.putExtra(TAcqIntentExtra.EXTRA_TITLE, title);
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESCRIPTION, description);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CARD_ID, cardId);
+        intent.putExtra(TAcqIntentExtra.EXTRA_E_MAIL, email);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CUSTOM_KEYBOARD, customKeyboard);
+        intent.putExtra(TAcqIntentExtra.EXTRA_RECURRENT_PAYMENT, recurrentPayment);
+        intent.putExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY, terminalKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PASSWORD, password);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PUBLIC_KEY, publicKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(PayCellInflater.DEFAULT_CELL_TYPES));
         return this;
     }
 
     public PayFormStarter prepare(String orderId, Long amount, boolean recurrentPayment) {
         intent = new Intent();
-        intent.putExtra(PayFormActivity.EXTRA_ORDER_ID, orderId);
-        intent.putExtra(PayFormActivity.EXTRA_AMOUNT, Money.ofRubles(amount));
-        intent.putExtra(PayFormActivity.EXTRA_RECURRENT_PAYMENT, recurrentPayment);
-        intent.putExtra(PayFormActivity.EXTRA_TERMINAL_KEY, terminalKey);
-        intent.putExtra(PayFormActivity.EXTRA_PASSWORD, password);
-        intent.putExtra(PayFormActivity.EXTRA_PUBLIC_KEY, publicKey);
-        intent.putExtra(PayFormActivity.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(PayCellInflater.DEFAULT_CELL_TYPES));
+        intent.putExtra(TAcqIntentExtra.EXTRA_ORDER_ID, orderId);
+        intent.putExtra(TAcqIntentExtra.EXTRA_AMOUNT, Money.ofRubles(amount));
+        intent.putExtra(TAcqIntentExtra.EXTRA_RECURRENT_PAYMENT, recurrentPayment);
+        intent.putExtra(TAcqIntentExtra.EXTRA_TERMINAL_KEY, terminalKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PASSWORD, password);
+        intent.putExtra(TAcqIntentExtra.EXTRA_PUBLIC_KEY, publicKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(PayCellInflater.DEFAULT_CELL_TYPES));
         return this;
     }
 
     public PayFormStarter setGooglePayParams(GooglePayParams googlePayParams) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_ANDROID_PAY_PARAMS, googlePayParams);
+        intent.putExtra(TAcqIntentExtra.EXTRA_ANDROID_PAY_PARAMS, googlePayParams);
         return this;
     }
 
     public PayFormStarter setCustomerKey(String customerKey) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_CUSTOMER_KEY, customerKey);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CUSTOMER_KEY, customerKey);
         return this;
     }
 
     public PayFormStarter setReceipt(Receipt receipt) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_RECEIPT_VALUE, receipt);
+        intent.putExtra(TAcqIntentExtra.EXTRA_RECEIPT_VALUE, receipt);
         return this;
     }
 
     public PayFormStarter setData(HashMap<String, String> data) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_DATA_VALUE, data);
+        intent.putExtra(TAcqIntentExtra.EXTRA_DATA_VALUE, data);
         return this;
     }
 
     public PayFormStarter setChargeMode(boolean mode) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_CHARGE_MODE, mode);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CHARGE_MODE, mode);
         return this;
     }
 
     public PayFormStarter useFirstAttachedCard(boolean use) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_USE_FIRST_ATTACHED_CARD, use);
+        intent.putExtra(TAcqIntentExtra.EXTRA_USE_FIRST_ATTACHED_CARD, use);
         return this;
     }
 
     public PayFormStarter setTheme(@StyleRes int theme) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_THEME, theme);
+        intent.putExtra(TAcqIntentExtra.EXTRA_THEME, theme);
         return this;
     }
 
     public PayFormStarter setCameraCardScanner(ICameraCardScanner cameraCardScanner) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_CAMERA_CARD_SCANNER, cameraCardScanner);
+        intent.putExtra(TAcqIntentExtra.EXTRA_CAMERA_CARD_SCANNER, cameraCardScanner);
         return this;
     }
 
     public PayFormStarter setDesignConfiguration(PayCellType... types) {
         checkIntent();
-        intent.putExtra(PayFormActivity.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(types));
+        intent.putExtra(TAcqIntentExtra.EXTRA_DESIGN_CONFIGURATION, PayCellType.toIntArray(types));
+        return this;
+    }
+
+    public PayFormStarter setLanguage(Language language) {
+        checkIntent();
+        intent.putExtra(TAcqIntentExtra.EXTRA_LANGUAGE, language.ordinal());
+        return this;
+    }
+
+    public PayFormStarter setRawLocalizationResourceId(int rawLocalizationResourceId) {
+        checkIntent();
+        intent.putExtra(TAcqIntentExtra.EXTRA_LOCALIZATION_RAW_RESOURCE_ID, rawLocalizationResourceId);
         return this;
     }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/TAcqIntentExtra.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/TAcqIntentExtra.java
new file mode 100644
index 0000000..f3aa415
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/TAcqIntentExtra.java
@@ -0,0 +1,42 @@
+package ru.tinkoff.acquiring.sdk;
+
+/**
+ * @author a.shishkin1
+ */
+public class TAcqIntentExtra {
+    
+    public static final String EXTRA_TERMINAL_KEY = "terminal_key";
+    public static final String EXTRA_PASSWORD = "password";
+    public static final String EXTRA_PUBLIC_KEY = "public_key";
+    public static final String EXTRA_ORDER_ID = "order_id";
+    public static final String EXTRA_AMOUNT = "amount";
+    public static final String EXTRA_TITLE = "title";
+    public static final String EXTRA_DESCRIPTION = "description";
+    public static final String EXTRA_CARD_ID = "card_id";
+    public static final String EXTRA_E_MAIL = "email";
+    public static final String EXTRA_CUSTOM_KEYBOARD = "keyboard";
+    public static final String EXTRA_CUSTOMER_KEY = "customer_key";
+    public static final String EXTRA_RECURRENT_PAYMENT = "recurrent_payment";
+    public static final String EXTRA_PAYMENT_ID = "payment_id";
+    public static final String EXTRA_RECEIPT_VALUE = "receipt_value";
+    public static final String EXTRA_DATA_VALUE = "data_value";
+    public static final String EXTRA_CHARGE_MODE = "charge_mode";
+    public static final String EXTRA_USE_FIRST_ATTACHED_CARD = "use_first_saved_card";
+    public static final String EXTRA_THEME = "theme";
+    public static final String EXTRA_CAMERA_CARD_SCANNER = "card_scanner";
+    public static final String EXTRA_DESIGN_CONFIGURATION = "design_configuration";
+    public static final String EXTRA_ANDROID_PAY_PARAMS = "android_pay_params";
+    public static final String EXTRA_CARD_DATA = "extra_card_data";
+    public static final String EXTRA_PAYMENT_INFO = "extra_payment_info";
+    public static final String EXTRA_THREE_DS = "extra_three_ds";
+    public static final String EXTRA_CHECK_TYPE = "check_type";
+    public static final String EXTRA_DATA = "data";
+    public static final String EXTRA_LANGUAGE = "language";
+    public static final String EXTRA_LOCALIZATION_RAW_RESOURCE_ID = "localizationRawResourceId";
+    public static final String EXTRA_LOCALIZATION_FILE_PATH = "localizationFilePath";
+    public static final String EXTRA_ERROR = "error";
+    
+    private TAcqIntentExtra () {
+        throw new AssertionError("no TAcqIntentExtra instances");
+    }
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
index f242847..d9a6628 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
@@ -4,8 +4,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import ru.tinkoff.acquiring.sdk.R;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
 
 import static ru.tinkoff.acquiring.sdk.inflate.attach.AttachCellType.ATTACH_BUTTON;
 import static ru.tinkoff.acquiring.sdk.inflate.attach.AttachCellType.PAYMENT_CARD_REQUISITES;
@@ -44,7 +47,7 @@ public static AttachCellInflater from(Context context, AttachCellType[] cellType
 
     public View inflate(ViewGroup container) {
         validate(PAYMENT_CARD_REQUISITES, ATTACH_BUTTON, SECURE_LOGOS);
-
+        AsdkLocalization localization = AsdkLocalizations.require(container.getContext());
         View root = inflater.inflate(R.layout.acq_fragment_attach_card_base, container, false);
         container = root.findViewById(R.id.ll_container_layout);
         for (AttachCellType cellType : cellTypes) {
@@ -58,9 +61,11 @@ public View inflate(ViewGroup container) {
                 case PAYMENT_CARD_REQUISITES:
                     inflater.inflate(R.layout.acq_cell_payment_card_requisites_attach, container, true);
                     break;
-                case EMAIL:
-                    inflater.inflate(R.layout.acq_cell_email, container, true);
+                case EMAIL: {
+                    View view = inflater.inflate(R.layout.acq_cell_email, container, true);
+                    ((TextView) view.findViewById(R.id.et_email)).setHint(localization.payEmail);
                     break;
+                }
                 case ATTACH_BUTTON:
                     inflater.inflate(R.layout.acq_cell_attach_button, container, true);
                     break;
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
index 894e4a2..cd23838 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
@@ -4,8 +4,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import ru.tinkoff.acquiring.sdk.R;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalizations;
 
 import static ru.tinkoff.acquiring.sdk.inflate.pay.PayCellType.PAYMENT_CARD_REQUISITES;
 import static ru.tinkoff.acquiring.sdk.inflate.pay.PayCellType.PAY_BUTTON;
@@ -45,7 +48,7 @@ public static PayCellInflater from(Context context, PayCellType[] cellTypes) {
 
     public View inflate(ViewGroup container) {
         validate(PAYMENT_CARD_REQUISITES, PAY_BUTTON, SECURE_LOGOS);
-
+        AsdkLocalization localization = AsdkLocalizations.require(container.getContext());
         View root = inflater.inflate(R.layout.acq_fragment_enter_card_base, container, false);
         container = root.findViewById(R.id.ll_container_layout);
         for (PayCellType cellType : cellTypes) {
@@ -56,12 +59,16 @@ public View inflate(ViewGroup container) {
                 case PRODUCT_DESCRIPTION:
                     inflater.inflate(R.layout.acq_cell_product_description, container, true);
                     break;
-                case AMOUNT:
-                    inflater.inflate(R.layout.acq_cell_amount, container, true);
+                case AMOUNT: {
+                    View view = inflater.inflate(R.layout.acq_cell_amount, container, true);
+                    ((TextView)view.findViewById(R.id.tv_amount_label)).setText(localization.payMoneyAmount);
                     break;
-                case PAYMENT_CARD_REQUISITES:
-                    inflater.inflate(R.layout.acq_cell_payment_card_requisites, container, true);
+                }
+                case PAYMENT_CARD_REQUISITES: {
+                    View view = inflater.inflate(R.layout.acq_cell_payment_card_requisites, container, true);
+                    ((TextView)view.findViewById(R.id.tv_src_card_choose_btn)).setText(localization.payCardChangeCard);
                     break;
+                }
                 case EMAIL:
                     inflater.inflate(R.layout.acq_cell_email, container, true);
                     break;
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
new file mode 100644
index 0000000..2d99226
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
@@ -0,0 +1,108 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @author a.shishkin1
+ */
+public class AsdkLocalization {
+
+    @SerializedName("Pay.Title") public String payTitle;
+
+    @SerializedName("Pay.Card.NewCard") public String payCardNewCard;
+
+    @SerializedName("Pay.Card.SavedCard") public String payCardSavedCard;
+
+    @SerializedName("Pay.Card.ChangeCard") public String payCardChangeCard;
+
+    @SerializedName("Pay.Card.ChooseLinkedCard") public String payCardChooseLinkedCard;
+
+    @SerializedName("Pay.Card.PanHint") public String payCardPanHint;
+
+    @SerializedName("Pay.Card.PanHint.Recurrent") public String payCardPanHintRecurrent;
+
+    @SerializedName("Pay.Card.ExpireDateHint") public String payCardExpireDateHint;
+
+    @SerializedName("Pay.Card.CvcHint") public String payCardCvcHint;
+
+    @SerializedName("Pay.Money.Amount") public String payMoneyAmount;
+
+    @SerializedName("Pay.Email") public String payEmail;
+
+    @SerializedName("Pay.PayButton") public String payPayButton;
+
+    @SerializedName("Pay.Dialog.Error.Title") public String payDialogErrorTitle;
+
+    @SerializedName("Pay.Dialog.Error.FallbackMessage") public String payDialogErrorFallbackMessage;
+
+    @SerializedName("Pay.Dialog.Error.Network") public String payDialogErrorNetwork;
+
+    @SerializedName("Pay.Dialog.Error.AcceptButton") public String payDialogErrorAcceptButton;
+
+    @SerializedName("Pay.Dialog.Validation.Title") public String payDialogValidationTitle;
+
+    @SerializedName("Pay.Dialog.Validation.InvalidEmail") public String payDialogValidationInvalidEmail;
+
+    @SerializedName("Pay.Dialog.Validation.InvalidCard") public String payDialogValidationInvalidCard;
+
+    @SerializedName("Pay.Dialog.Progress.PayMessage") public String payDialogProgressPayMessage;
+
+    @SerializedName("Pay.Dialog.CardScan.Nfc") public String payDialogCardScanNfc;
+
+    @SerializedName("Pay.Dialog.CardScan.Camera") public String payDialogCardScanCamera;
+
+    @SerializedName("Pay.Dialog.Cvc.Message") public String payDialogCvcMessage;
+
+    @SerializedName("Pay.Dialog.Cvc.AcceptButton") public String payDialogCvcAcceptButton;
+
+    @SerializedName("Pay.Nfc.Fail") public String payNfcFail;
+
+    @SerializedName("Pay.NoScanProviders") public String payNoScanProviders;
+
+    @SerializedName("ConfirmationLoop.Title") public String confirmationLoopTitle;
+
+    @SerializedName("ConfirmationLoop.Description") public String confirmationLoopDescription;
+
+    @SerializedName("ConfirmationLoop.Amount") public String confirmationLoopAmount;
+
+    @SerializedName("ConfirmationLoop.Dialog.Validation.InvalidAmount") public String confirmationLoopDialogValidationInvalidAmount;
+
+    @SerializedName("ConfirmationLoop.CheckButton") public String confirmationLoopCheckButton;
+
+    @SerializedName("Confirmation3DS.Title") public String confirmation3DSTitle;
+
+    @SerializedName("AddCard.Title") public String addCardTitle;
+
+    @SerializedName("AddCard.AddCardButton") public String addCardAddCardButton;
+
+    @SerializedName("AddCard.Dialog.Error.Title") public String addCardDialogErrorTitle;
+
+    @SerializedName("AddCard.Dialog.Error.Network") public String addCardDialogErrorNetwork;
+
+    @SerializedName("AddCard.Nfc.Fail") public String addCardNfcFail;
+
+    @SerializedName("AddCard.Dialog.Progress.AddCardMessage") public String addCardDialogProgressAddCardMessage;
+
+    @SerializedName("AddCard.Dialog.Error.FallbackMessage") public String addCardDialogErrorFallbackMessage;
+
+    @SerializedName("AddCard.NoScanProviders") public String addCardNoScanProviders;
+
+    @SerializedName("CardList.Title") public String cardListTitle;
+
+    @SerializedName("CardList.NewCard") public String cardListNewCard;
+
+    @SerializedName("CardList.Delete") public String cardListDelete;
+
+    @SerializedName("CardList.RemoveCard.FailMessage") public String cardListRemoveCardFailMessage;
+
+    @SerializedName("Nfc.Title") public String nfcTitle;
+
+    @SerializedName("Nfc.Description") public String nfcDescription;
+
+    @SerializedName("Nfc.CloseButton") public String nfcCloseButton;
+
+    @SerializedName("Nfc.Dialog.Disable.Title") public String nfcDialogDisableTitle;
+
+    @SerializedName("Nfc.Dialog.Disable.Message") public String nfcDialogDisableMessage;
+
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
new file mode 100644
index 0000000..676063d
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
@@ -0,0 +1,172 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.os.Build;
+import android.support.v4.app.Fragment;
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import ru.tinkoff.acquiring.sdk.Language;
+import ru.tinkoff.acquiring.sdk.R;
+import ru.tinkoff.acquiring.sdk.TAcqIntentExtra;
+
+/**
+ * @author a.shishkin1
+ */
+public class AsdkLocalizations {
+
+    private AsdkLocalizations() {
+        throw new AssertionError();
+    }
+
+    public static  AsdkLocalization require(Fragment fragment) {
+        return require(fragment.getActivity());
+    }
+
+    public static  AsdkLocalization require(Context context) {
+        if (context instanceof HasAsdkLocalization) {
+            return ((HasAsdkLocalization) context).getAsdkLocalization();
+        } else {
+            throw new ClassCastException(context.getClass().getCanonicalName() + " must implement HasAsdkLocalization" );
+        }
+    }
+
+    static AsdkLocalization unsafeGet(Context context) {
+        Context activityCandidate = context;
+        while (!(activityCandidate instanceof Activity)) {
+            if (activityCandidate == null) {
+                throw new IllegalArgumentException("can't find activity");
+            }
+
+            if (activityCandidate instanceof ContextWrapper) {
+                activityCandidate = ((ContextWrapper) activityCandidate).getBaseContext();
+            }
+        }
+
+        Activity activity = (Activity) activityCandidate;
+
+        int rawResource = activity.getIntent().getIntExtra(TAcqIntentExtra.EXTRA_LOCALIZATION_RAW_RESOURCE_ID, 0);
+        if (rawResource != 0) {
+            return createLocalization(activity, rawResource);
+        }
+
+        String filePath = activity.getIntent().getStringExtra(TAcqIntentExtra.EXTRA_LOCALIZATION_FILE_PATH);
+        if (filePath != null) {
+            return createLocalization(activity, new File(filePath));
+        }
+
+        String fullJsonSource = activity.getIntent().getStringExtra("json");
+        if (fullJsonSource != null) {
+            return createLocalization(activity, fullJsonSource);
+        }
+
+        int languageOrdinal = activity.getIntent().getIntExtra(TAcqIntentExtra.EXTRA_LANGUAGE, -1);
+        if (languageOrdinal != -1) {
+            try {
+                return createLocalization(activity, Language.values()[languageOrdinal]);
+            } catch (IndexOutOfBoundsException ex) {
+                throw new IllegalArgumentException("Malformed language parameter " + languageOrdinal, ex);
+            }
+        } else {
+           return createLocalization(activity, resolveLanguageByCurrentLocale(activity));
+        }
+    }
+
+    public static Language resolveLanguageByCurrentLocale(Context context) {
+        Locale locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            locale = context.getResources().getConfiguration().getLocales().get(0);
+        } else {
+            locale = context.getResources().getConfiguration().locale;
+        }
+        if (locale.getLanguage().equals(new Locale("ru").getLanguage())) {
+            return Language.RUSSIAN;
+        } else {
+            return Language.ENGLISH;
+        }
+    }
+
+    private static AsdkLocalization createLocalization(Context context, Object src) {
+        AsdkLocalization localization;
+        if (src instanceof Integer) {
+            localization = create(context, (Integer) src);
+        } else if (src instanceof Language) {
+            localization = create(context, (Language) src);
+        } else if (src instanceof String) {
+            localization = create((String) src);
+        } else if (src instanceof File) {
+            localization = create((File) src);
+        } else {
+            throw new IllegalArgumentException("unsupported localization source " + src);
+        }
+        ensureLocalization(localization);
+        return localization;
+    }
+
+    private static AsdkLocalization create(
+            Context context, int rawResourceId
+    ) {
+        try {
+            return new RawResourceLocalizationParser(context.getApplicationContext(), new GsonLocalizationParser()).parse(rawResourceId);
+        } catch (LocalizationParser.LocalizationParseException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static AsdkLocalization create(
+            Context context, Language language
+    ) {
+        switch (language) {
+            case ENGLISH: return create(context, R.raw.acq_localization_en);
+            case RUSSIAN: return create(context, R.raw.acq_localization_ru);
+            default: throw new IllegalArgumentException("unknown resource for language: " + language.name());
+        }
+    }
+
+    private static AsdkLocalization create(File file) {
+        try {
+            return new FileLocalizationParser(new GsonLocalizationParser()).parse(file);
+        } catch (LocalizationParser.LocalizationParseException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static AsdkLocalization create(String src) {
+        try {
+            return new GsonLocalizationParser().parse(src);
+        } catch (LocalizationParser.LocalizationParseException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static void ensureLocalization(AsdkLocalization localization) {
+        List<String> missing = new LinkedList<>();
+        for (Field field : AsdkLocalization.class.getDeclaredFields()) {
+            SerializedName serializedName = field.getAnnotation(SerializedName.class);
+
+            if (serializedName == null) continue;
+
+            try {
+                if (field.get(localization) == null) {
+                    missing.add(serializedName.value());
+                }
+            } catch (IllegalAccessException e) {
+                // ignore
+            }
+        }
+
+        if (missing.isEmpty()) return;
+
+        throw new IllegalArgumentException("localization must contains: " + TextUtils.join(", ", missing));
+    }
+
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/FileLocalizationParser.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/FileLocalizationParser.java
new file mode 100644
index 0000000..5346846
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/FileLocalizationParser.java
@@ -0,0 +1,38 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import android.content.Context;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author a.shishkin1
+ */
+public class FileLocalizationParser implements LocalizationParser<File> {
+
+    private LocalizationParser<String> inner;
+
+    public FileLocalizationParser(LocalizationParser<String> inner) {
+        this.inner = inner;
+    }
+
+    @Override
+    public AsdkLocalization parse(File file) throws LocalizationParseException {
+        InputStream is = null;
+        try {
+            return inner.parse(Utility.read(is = new FileInputStream(file)));
+        } catch (IOException e) {
+            throw new LocalizationParser.LocalizationParseException(e);
+        } finally {
+            try {
+                if (is != null) {
+                    is.close();
+                }
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/GsonLocalizationParser.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/GsonLocalizationParser.java
new file mode 100644
index 0000000..96e724f
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/GsonLocalizationParser.java
@@ -0,0 +1,20 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import com.google.gson.Gson;
+
+import java.util.Map;
+
+/**
+ * @author a.shishkin1
+ */
+public class GsonLocalizationParser implements LocalizationParser<String> {
+
+    @Override
+    public AsdkLocalization parse(String s) throws LocalizationParseException {
+        try {
+            return new Gson().fromJson(s, AsdkLocalization.class);
+        } catch (Exception e) {
+            throw new LocalizationParseException(e);
+        }
+    }
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/HasAsdkLocalization.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/HasAsdkLocalization.java
new file mode 100644
index 0000000..6b9d270
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/HasAsdkLocalization.java
@@ -0,0 +1,40 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import android.app.Activity;
+import android.arch.lifecycle.Lifecycle;
+import android.arch.lifecycle.LifecycleObserver;
+import android.arch.lifecycle.LifecycleOwner;
+import android.arch.lifecycle.OnLifecycleEvent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+
+import java.util.concurrent.Callable;
+import java.util.function.Supplier;
+
+/**
+ * @author a.shishkin1
+ */
+public interface HasAsdkLocalization {
+
+    AsdkLocalization getAsdkLocalization();
+
+    class AsdkLocalizationProperty implements HasAsdkLocalization {
+        AsdkLocalization asdkLocalization;
+
+        public AsdkLocalizationProperty(Context context) {
+            asdkLocalization = AsdkLocalizations.unsafeGet(context);
+        }
+
+        @Override
+        public AsdkLocalization getAsdkLocalization() {
+            return asdkLocalization;
+        }
+    }
+}
+
+
+
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/LocalizationParser.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/LocalizationParser.java
new file mode 100644
index 0000000..7cf9e99
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/LocalizationParser.java
@@ -0,0 +1,19 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+/**
+ * @author a.shishkin1
+ */
+public interface LocalizationParser<Source> {
+
+    AsdkLocalization parse(Source source) throws LocalizationParseException;
+
+    class LocalizationParseException extends Exception {
+        public LocalizationParseException(String message, Throwable cause) {
+            super(message, cause);
+        }
+
+        public LocalizationParseException(Throwable cause) {
+            super(cause);
+        }
+    }
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/RawResourceLocalizationParser.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/RawResourceLocalizationParser.java
new file mode 100644
index 0000000..0068f06
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/RawResourceLocalizationParser.java
@@ -0,0 +1,36 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import android.content.Context;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author a.shishkin1
+ */
+public class RawResourceLocalizationParser implements LocalizationParser<Integer>{
+
+    private LocalizationParser<String> inner;
+    private Context context;
+
+    public RawResourceLocalizationParser(Context context, LocalizationParser<String> inner) {
+        this.context = context;
+        this.inner = inner;
+    }
+
+    @Override
+    public AsdkLocalization parse(Integer resourceId) throws LocalizationParseException {
+        InputStream is = context.getResources().openRawResource(resourceId);
+        try {
+            return inner.parse(Utility.read(is));
+        } catch (IOException e) {
+            throw new LocalizationParser.LocalizationParseException(e);
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Utility.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Utility.java
new file mode 100644
index 0000000..1a6656f
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Utility.java
@@ -0,0 +1,24 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+/**
+ * @author a.shishkin1
+ */
+class Utility {
+
+    static String read(InputStream is) throws IOException {
+        char[] buffer = new char[1024];
+        StringBuilder result = new StringBuilder();
+        Reader in = new InputStreamReader(is);
+        int v;
+        while((v = in.read(buffer, 0, buffer.length)) >= 0) {
+            result.append(buffer, 0, v);
+        }
+        return result.toString();
+    }
+
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/nfc/AsdkNfcScanActivity.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/nfc/AsdkNfcScanActivity.java
index d6b0fbb..0335675 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/nfc/AsdkNfcScanActivity.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/nfc/AsdkNfcScanActivity.java
@@ -8,9 +8,12 @@
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 import ru.tinkoff.acquiring.sdk.CreditCard;
 import ru.tinkoff.acquiring.sdk.R;
+import ru.tinkoff.acquiring.sdk.localization.AsdkLocalization;
+import ru.tinkoff.acquiring.sdk.localization.HasAsdkLocalization;
 import ru.tinkoff.core.nfc2.BaseNfcActivity;
 import ru.tinkoff.core.nfc2.ImperfectAlgorithmException;
 import ru.tinkoff.core.nfc2.MalformedDataException;
@@ -18,19 +21,25 @@
 /**
  * @author Vitaliy Markus
  */
-public class AsdkNfcScanActivity extends BaseNfcActivity {
+public class AsdkNfcScanActivity extends BaseNfcActivity implements HasAsdkLocalization {
 
     public static final String EXTRA_CARD = "card_extra";
     public static final int RESULT_ERROR = 256;
 
     private static final int ALPHA_MASK = 0xCCFFFFFF;
 
+    private AsdkLocalizationProperty asdkLocalizationProperty;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        asdkLocalizationProperty = new AsdkLocalizationProperty(this);
         setContentView(R.layout.acq_activity_nfc);
 
+        ((TextView) findViewById(R.id.tv_description)).setText(getAsdkLocalization().nfcDescription);
+
         Button closeBtn = findViewById(R.id.acq_btn_close);
+        closeBtn.setText(getAsdkLocalization().nfcCloseButton);
         closeBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -58,12 +67,12 @@ public void onBackPressed() {
 
     @Override
     public String getNfcDisabledDialogTitle() {
-        return getString(R.string.acq_nfc_is_disable);
+        return getAsdkLocalization().nfcDialogDisableTitle;
     }
 
     @Override
     public String getNfcDisabledDialogMessage() {
-        return getString(R.string.acq_nfc_need_enable);
+        return getAsdkLocalization().nfcDialogDisableMessage;
     }
 
     @Override
@@ -97,4 +106,9 @@ private void onException() {
         setResult(RESULT_ERROR);
         finish();
     }
+
+    @Override
+    public AsdkLocalization getAsdkLocalization() {
+        return asdkLocalizationProperty.getAsdkLocalization();
+    }
 }
diff --git a/ui/src/main/res/layout/acq_activity_nfc.xml b/ui/src/main/res/layout/acq_activity_nfc.xml
index 7f3d07c..cb7bde8 100644
--- a/ui/src/main/res/layout/acq_activity_nfc.xml
+++ b/ui/src/main/res/layout/acq_activity_nfc.xml
@@ -23,10 +23,10 @@
             android:src="@drawable/acq_nfc" />
 
         <TextView
+            android:id="@+id/tv_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/acq_nfc_description"
             android:textColor="@color/acq_colorNfcTint" />
 
 
@@ -41,7 +41,6 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:paddingTop="8dp"
-        android:text="@string/acq_btn_close"
         android:textColor="@drawable/acq_nfc_tint_color_pressable" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_cell_amount.xml b/ui/src/main/res/layout/acq_cell_amount.xml
index d75e16b..2877ca4 100644
--- a/ui/src/main/res/layout/acq_cell_amount.xml
+++ b/ui/src/main/res/layout/acq_cell_amount.xml
@@ -10,7 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/acq_money_label" />
+        />
 
     <TextView
         android:id="@+id/tv_amount"
diff --git a/ui/src/main/res/layout/acq_cell_payment_card_requisites.xml b/ui/src/main/res/layout/acq_cell_payment_card_requisites.xml
index 29d5f87..eab60b7 100644
--- a/ui/src/main/res/layout/acq_cell_payment_card_requisites.xml
+++ b/ui/src/main/res/layout/acq_cell_payment_card_requisites.xml
@@ -20,8 +20,7 @@
             android:id="@+id/tv_src_card_choose_btn"
             style="?acqAccentTextStyle"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/acq_change_card_label" />
+            android:layout_height="wrap_content" />
 
     </LinearLayout>
 
diff --git a/ui/src/main/res/layout/acq_fragment_attach_card.xml b/ui/src/main/res/layout/acq_fragment_attach_card.xml
deleted file mode 100644
index 928144e..0000000
--- a/ui/src/main/res/layout/acq_fragment_attach_card.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:id="@+id/ll_container_layout"
-            style="?acqContentViewStyle"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_title"
-                style="?acqPayTitleStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/tv_description"
-                style="?acqPayDescriptionStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <ru.tinkoff.acquiring.sdk.views.EditCardView
-                android:id="@+id/ecv_card"
-                style="?acqCardViewTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqContentBlockDivider" />
-
-            <ru.tinkoff.acquiring.sdk.views.FixCompatEditText
-                android:id="@+id/et_email"
-                style="?acqPayEmailStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider"
-                android:inputType="textEmailAddress" />
-
-            <Button
-                android:id="@+id/btn_attach"
-                style="?acqButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider" />
-
-            <Space
-                android:id="@+id/space"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/iv_secure_icons"
-                style="?acqPaySecureIconStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider"
-                android:scaleType="centerInside" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <ru.tinkoff.acquiring.sdk.views.BankKeyboard
-        android:id="@+id/acq_keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_enter_card.xml b/ui/src/main/res/layout/acq_fragment_enter_card.xml
deleted file mode 100644
index e436314..0000000
--- a/ui/src/main/res/layout/acq_fragment_enter_card.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:id="@+id/ll_container_layout"
-            style="?acqContentViewStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_title"
-                style="?acqPayTitleStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/tv_description"
-                style="?acqPayDescriptionStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-
-            <LinearLayout
-                android:id="@+id/ll_price_layout"
-                style="?acqPriceLayoutStyle"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/tv_amount_label"
-                    style="?acqTextViewStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/acq_money_label" />
-
-                <TextView
-                    android:id="@+id/tv_amount"
-                    style="?acqTitleTextViewStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/ll_src_card_chooser"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqContentBlockDivider"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/tv_src_card_label"
-                    style="?acqTitleTextViewStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:id="@+id/tv_src_card_choose_btn"
-                    style="?acqAccentTextStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/acq_change_card_label" />
-
-            </LinearLayout>
-
-
-            <ru.tinkoff.acquiring.sdk.views.EditCardView
-                android:id="@+id/ecv_card"
-                style="?acqCardViewTextStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqContentBlockDivider" />
-
-
-            <ru.tinkoff.acquiring.sdk.views.FixCompatEditText
-                android:id="@+id/et_email"
-                style="?acqPayEmailStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider"
-                android:inputType="textEmailAddress" />
-
-            <LinearLayout
-                android:id="@+id/pay_buttons_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider"
-                android:orientation="vertical">
-
-                <Button
-                    android:id="@+id/btn_pay"
-                    style="?acqButtonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:layout_margin="4dp" />
-
-                <LinearLayout
-                    android:id="@+id/fl_android_pay_placeholder"
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:orientation="vertical">
-
-                    <include layout="@layout/gpay_button_short_no_shadow" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <Space
-                android:id="@+id/space"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/iv_secure_icons"
-                style="?acqPaySecureIconStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?acqViewDivider"
-                android:scaleType="centerInside" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <ru.tinkoff.acquiring.sdk.views.BankKeyboard
-        android:id="@+id/acq_keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_loop_confirmation.xml b/ui/src/main/res/layout/acq_fragment_loop_confirmation.xml
index 3246ecd..e7c6b0e 100644
--- a/ui/src/main/res/layout/acq_fragment_loop_confirmation.xml
+++ b/ui/src/main/res/layout/acq_fragment_loop_confirmation.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
-        android:text="@string/acq_attaching_card_loop_title"
         android:visibility="visible" />
 
     <ru.tinkoff.acquiring.sdk.views.FixCompatEditText
@@ -22,7 +21,6 @@
         android:layout_height="wrap_content"
         android:digits="0123456789.,"
         android:gravity="left"
-        android:hint="@string/acq_attaching_card_loop_amount_hint"
         android:imeOptions="actionDone"
         android:inputType="numberDecimal" />
 
@@ -31,8 +29,7 @@
         style="?acqButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?acqViewDivider"
-        android:text="@string/acq_check" />
+        android:layout_marginTop="?acqViewDivider" />
 
     <Space
         android:id="@+id/space"
diff --git a/ui/src/main/res/layout/acq_item_new_card.xml b/ui/src/main/res/layout/acq_item_new_card.xml
index 45b4623..542d807 100644
--- a/ui/src/main/res/layout/acq_item_new_card.xml
+++ b/ui/src/main/res/layout/acq_item_new_card.xml
@@ -3,10 +3,11 @@
     style="?acqItemsStyle">
 
     <TextView
+        android:id="@+id/acq_tv_new_card"
         style="?acqTitleTextViewStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="@string/acq_enter_new_card_label" />
+        />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/menu/menu_delete_card.xml b/ui/src/main/res/menu/menu_delete_card.xml
deleted file mode 100644
index 56b5ba2..0000000
--- a/ui/src/main/res/menu/menu_delete_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_delete"
-        android:title="@string/acq_delete_label"
-        android:icon="@drawable/acq_delete"
-        android:orderInCategory="100"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
new file mode 100644
index 0000000..1637a7a
--- /dev/null
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -0,0 +1,51 @@
+{
+  "Pay.Title": " ",
+  "Pay.Card.NewCard": "New card",
+  "Pay.Card.SavedCard": "Linked card",
+  "Pay.Card.ChangeCard": "Change",
+  "Pay.Card.ChooseLinkedCard": "Choose card",
+  "Pay.Card.PanHint": "PAN",
+  "Pay.Card.PanHint.Recurrent": "Choose card",
+  "Pay.Card.ExpireDateHint": "MM/YY",
+  "Pay.Card.CvcHint": "CVC",
+  "Pay.Money.Amount": " ",
+  "Pay.Email": "E-mail for receipt",
+  "Pay.PayButton": "Pay",
+  "Pay.Dialog.Error.Title": "Error",
+  "Pay.Dialog.Error.FallbackMessage": "Something went wrong",
+  "Pay.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
+  "Pay.Dialog.Error.AcceptButton": "OK",
+  "Pay.Dialog.Validation.Title": " ",
+  "Pay.Dialog.Validation.InvalidEmail": "Invalid e-mail",
+  "Pay.Dialog.Validation.InvalidCard": "Invalid card data",
+  "Pay.Dialog.Progress.PayMessage": "Payment…",
+  "Pay.Dialog.CardScan.Nfc": "Scan with NFC",
+  "Pay.Dialog.CardScan.Camera": "Scan with camera",
+  "Pay.Dialog.Сvc.Message": "To complete payment, enter CVC",
+  "Pay.Dialog.Сvc.AcceptButton": "OK",
+  "Pay.Nfc.Fail": " ",
+  "Pay.NoScanProviders": " ",
+  "ConfirmationLoop.Title": " ",
+  "ConfirmationLoop.Description": "In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ?)/ Please, specify the sum with accuracy to amount of coins.",
+  "ConfirmationLoop.Amount": "Blocked amount",
+  "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Please enter correct amount in coins",
+  "ConfirmationLoop.CheckButton": "Check",
+  "Confirmation3DS.Title": " ",
+  "AddCard.Title": "Add card",
+  "AddCard.AddCardButton": "Add card",
+  "AddCard.Dialog.Error.Title": "Error",
+  "AddCard.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
+  "AddCard.Nfc.Fail": " ",
+  "AddCard.Dialog.Progress.AddCardMessage": "Attaching card…",
+  "AddCard.Dialog.Error.FallbackMessage": "Something went wrong",
+  "AddCard.NoScanProviders": " ",
+  "CardList.Title": "Select card",
+  "CardList.NewCard": "Add new card",
+  "CardList.Delete": "Delete",
+  "CardList.RemoveCard.FailMessage": " ",
+  "Nfc.Title": " ",
+  "Nfc.Description": "Bring the card to the back of the phone",
+  "Nfc.CloseButton": "Close",
+  "Nfc.Dialog.Disable.Title": " ",
+  "Nfc.Dialog.Disable.Message": " "
+}
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
new file mode 100644
index 0000000..af6d83d
--- /dev/null
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -0,0 +1,51 @@
+{
+  "Pay.Title": "Оплата",
+  "Pay.Card.NewCard": "Новая карта",
+  "Pay.Card.SavedCard": "Сохраненная карта",
+  "Pay.Card.ChangeCard": "Изменить",
+  "Pay.Card.ChooseLinkedCard": "Выберите карту из привязанных",
+  "Pay.Card.PanHint": "Номер карты",
+  "Pay.Card.PanHint.Recurrent": "Выберите карту из привязанных",
+  "Pay.Card.ExpireDateHint": "ММ/ГГ",
+  "Pay.Card.CvcHint": "CVC",
+  "Pay.Money.Amount": "На сумму:",
+  "Pay.Email": "E-mail для квитанции",
+  "Pay.PayButton": "Оплатить",
+  "Pay.Dialog.Error.Title": "Ошибка",
+  "Pay.Dialog.Error.FallbackMessage": "Что-то пошло не так",
+  "Pay.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
+  "Pay.Dialog.Error.AcceptButton": "OK",
+  "Pay.Dialog.Validation.Title": " ",
+  "Pay.Dialog.Validation.InvalidEmail": "Введен некорректный e-mail",
+  "Pay.Dialog.Validation.InvalidCard": "Введены некорректные данные карты",
+  "Pay.Dialog.Progress.PayMessage": "Оплата…",
+  "Pay.Dialog.CardScan.Nfc": "Сканировать по NFC",
+  "Pay.Dialog.CardScan.Camera": "Сканировать камерой",
+  "Pay.Dialog.Сvc.Message": " ",
+  "Pay.Dialog.Сvc.AcceptButton": "OK",
+  "Pay.Nfc.Fail": " ",
+  "Pay.NoScanProviders": " ",
+  "ConfirmationLoop.Title": "Оплата",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Amount": "Заблокированная сумма",
+  "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
+  "ConfirmationLoop.CheckButton": "Проверить",
+  "Confirmation3DS.Title": "Оплата",
+  "AddCard.Title": "Добавление карты",
+  "AddCard.AddCardButton": "Добавить",
+  "AddCard.Dialog.Error.Title": "Ошибка",
+  "AddCard.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
+  "AddCard.Nfc.Fail": " ",
+  "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
+  "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
+  "AddCard.NoScanProviders": " ",
+  "CardList.Title": "Выберите карту",
+  "CardList.NewCard": "Ввести данные новой карты",
+  "CardList.Delete": "Удалить",
+  "CardList.RemoveCard.FailMessage": "Не удалось удалить карту, попробуйте позже",
+  "Nfc.Title": " ",
+  "Nfc.Description": "Поднесите карту\\nк задней крышке телефона",
+  "Nfc.CloseButton": "Закрыть",
+  "Nfc.Dialog.Disable.Title": " ",
+  "Nfc.Dialog.Disable.Message": " "
+}
diff --git a/ui/src/main/res/values-ru/strings.xml b/ui/src/main/res/values-ru/strings.xml
index 69f3f44..0d2c4cc 100644
--- a/ui/src/main/res/values-ru/strings.xml
+++ b/ui/src/main/res/values-ru/strings.xml
@@ -1,46 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="acq_new_card_label">Новая карта</string>
-    <string name="acq_saved_card_label">Сохраненная карта</string>
-    <string name="acq_change_card_label">Изменить</string>
-    <string name="acq_money_label">На сумму:</string>
-    <string name="acq_card_number_hint">Номер карты</string>
-    <string name="acq_recurrent_mode_card_hint">Выберите карту из привязанных</string>
-    <string name="acq_exp_date_hint">ММ/ГГ</string>
-    <string name="acq_cvc_hint">CVC</string>
-    <string name="acq_email_hint">E-mail для квитанции</string>
-    <string name="acq_pay">Оплатить</string>
-    <string name="acq_check">Проверить</string>
-    <string name="acq_pay_with_amount">Оплатить %s Р</string>
-    <string name="acq_money_amount_format">%s Р</string>
-    <string name="acq_screen_title">Оплата</string>
-    <string name="acq_enter_new_card_label">Ввести данные новой карты</string>
-    <string name="acq_delete_label">Удалить</string>
-    <string name="acq_btn_close">Закрыть</string>
-    <string name="acq_dialog_dismiss_btn">OK</string>
-    <string name="acq_default_error_title">Ошибка</string>
-    <string name="acq_default_error_message">Что-то пошло не так</string>
-    <string name="acq_network_error_message">Вероятно, соединение с интернетом прервано, попробуйте позже</string>
-    <string name="acq_cant_delete_card_message">Не удалось удалить карту, попробуйте позже</string>
-    <string name="acq_nfc_description">Поднесите карту\nк задней крышке телефона</string>
-    <string name="acq_nfc_is_disable">NFC выключен</string>
-    <string name="acq_nfc_need_enable">Для сканирования карты необходимо включить NFC</string>
-    <string name="acq_nfc_scan_failed">Не удалось распознать карту</string>
-    <string name="acq_progress_dialog_text">Оплата…</string>
-    <string name="acq_progress_dialog_attach_card_text">Привязка карты…</string>
-    <string name="acq_invalid_email">Введен некорректный e-mail</string>
-    <string name="acq_invalid_card">Введены некорректные данные карты</string>
-    <string name="acq_attaching_card_loop_title">Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ₽)\nПожалуйста, укажите ее с точностью до копеек</string>
-    <string name="acq_attaching_card_loop_parse_error">Введите корректную сумму в копейках</string>
-    <string name="acq_attaching_card_loop_amount_hint">Заблокированная сумма</string>
-    <string name="acq_no_scan_providers">Отсутвуют провайдеры для сканирования</string>
-    <string name="acq_complete_payment">Для совершения платежа, введите CVC</string>
-    <string name="acq_complete_payment_ok">ОК</string>
-
-    <string-array name="acq_scan_types">
-        <item>Сканировать камерой</item>
-        <item>Сканировать по NFC</item>
-    </string-array>
-
 </resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/attrs.xml b/ui/src/main/res/values/attrs.xml
index 9f8d529..d140a81 100644
--- a/ui/src/main/res/values/attrs.xml
+++ b/ui/src/main/res/values/attrs.xml
@@ -14,7 +14,6 @@
     <attr name="acqKeyboardStyle" format="integer" />
     <attr name="acqViewDivider" format="dimension" />
     <attr name="acqContentBlockDivider" format="dimension" />
-    <attr name="acqPayFormTitle" format="string" />
 
     <attr name="acqCardIcons" format="integer" />
     <attr name="acqVisaIcon" format="reference" />
@@ -40,7 +39,5 @@
         <enum name="buttonUnderFieldsIconsUnderBottom" value="4" />
     </attr>
 
-    <attr name="acqPayWithAmountFormat" format="string|reference" />
-    <attr name="acqMoneyAmountFormat" format="string|reference" />
 
 </resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/ids.xml b/ui/src/main/res/values/ids.xml
new file mode 100644
index 0000000..78fd0e6
--- /dev/null
+++ b/ui/src/main/res/values/ids.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+    <item name="action_delete" type="id"/>
+
+</resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 61c3dfa..0ac0de1 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -1,45 +1,5 @@
 <resources>
 
-    <string name="acq_new_card_label">New card</string>
-    <string name="acq_saved_card_label">Linked card</string>
-    <string name="acq_change_card_label">Change</string>
-    <string name="acq_money_label">Amount:</string>
-    <string name="acq_card_number_hint">PAN</string>
-    <string name="acq_recurrent_mode_card_hint">Choose card</string>
-    <string name="acq_exp_date_hint">MM/YY</string>
-    <string name="acq_cvc_hint">CVC</string>
-    <string name="acq_email_hint">E-mail for receipt</string>
-    <string name="acq_pay">Pay</string>
-    <string name="acq_check">Check</string>
-    <string name="acq_pay_with_amount">Pay %s Р</string>
-    <string name="acq_money_amount_format">%s Р</string>
-    <string name="acq_screen_title">Payment</string>
-    <string name="acq_enter_new_card_label">Add new card</string>
-    <string name="acq_delete_label">Delete</string>
-    <string name="acq_btn_close">Close</string>
-    <string name="acq_dialog_dismiss_btn">OK</string>
-    <string name="acq_default_error_title">Error</string>
-    <string name="acq_default_error_message">Something went wrong</string>
-    <string name="acq_network_error_message">Probably the Internet connection is interrupted, try again later</string>
-    <string name="acq_cant_delete_card_message">Unable to remove the card, try again later</string>
-    <string name="acq_nfc_description">Bring the card to the back of the phone</string>
-    <string name="acq_nfc_is_disable">NFC is turn off</string>
-    <string name="acq_nfc_need_enable">Turn on NFC to scan a card</string>
-    <string name="acq_nfc_scan_failed">Failed to scan a card</string>
-    <string name="acq_progress_dialog_text">Payment…</string>
-    <string name="acq_progress_dialog_attach_card_text">Attaching card…</string>
-    <string name="acq_invalid_email">Invalid e-mail</string>
-    <string name="acq_invalid_card">Invalid card data</string>
-    <string name="acq_attaching_card_loop_title">In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ₽)/ Please, specify the sum with accuracy to amount of coins.</string>
-    <string name="acq_attaching_card_loop_parse_error">Please enter correct amount in coins</string>
-    <string name="acq_attaching_card_loop_amount_hint">Blocked amount</string>
-    <string name="acq_no_scan_providers">There aren\'t any providers</string>
-    <string name="acq_complete_payment">To complete payment, enter CVC</string>
-    <string name="acq_complete_payment_ok">OK</string>
 
-    <string-array name="acq_scan_types">
-        <item>Scan with camera</item>
-        <item>Scan with NFC</item>
-    </string-array>
 
 </resources>
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index 3ff0daa..39a1b8c 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -23,7 +23,6 @@
         <item name="acqPriceLayoutStyle">@style/AcquiringPriceLayoutStyle</item>
         <item name="acqViewDivider">16dp</item>
         <item name="acqContentBlockDivider">20dp</item>
-        <item name="acqPayFormTitle">@string/acq_screen_title</item>
         <item name="acqCardIcons">@style/AcquiringCardSystemsIcons</item>
         <item name="acqKeyboardStyle">@style/AcquiringKeyboardStyle</item>
         <!---->
@@ -33,8 +32,6 @@
         <item name="acqPaySecureIconStyle">@style/AcquiringPaySecureIconStyle</item>
         <item name="acqPayAmountPosition">onPayButton</item>
         <item name="acqPayButtonAndIconPosition">buttonUnderFieldsIconsOnBottom</item>
-        <item name="acqPayWithAmountFormat">@string/acq_pay_with_amount</item>
-        <item name="acqMoneyAmountFormat">@string/acq_money_amount_format</item>
 
     </style>
 
@@ -56,14 +53,10 @@
     </style>
 
     <style name="AcquiringCardViewStyle" parent="AcquiringFieldStyle">
-        <item name="numberHint">@string/acq_card_number_hint</item>
-        <item name="dateHint">@string/acq_exp_date_hint</item>
-        <item name="cvcHint">@string/acq_cvc_hint</item>
     </style>
 
     <style name="AcquiringButtonStyle" parent="Base.TextAppearance.AppCompat.Widget.Button">
         <item name="android:background">@drawable/acq_button_bg</item>
-        <item name="android:text">@string/acq_pay</item>
     </style>
 
     <style name="AcquiringTitleStyle">
@@ -159,7 +152,6 @@
     </style>
 
     <style name="AcquiringPayEmailStyle" parent="AcquiringFieldStyle">
-        <item name="android:hint">@string/acq_email_hint</item>
     </style>
 
     <style name="AcquiringPaySecureIconStyle">

From f0317a9a32b427aa26d09e7af7a46b4557587f06 Mon Sep 17 00:00:00 2001
From: "a.shishkin1" <a.shishkin1@tinkoff.ru>
Date: Fri, 7 Dec 2018 15:19:47 +0300
Subject: [PATCH 02/13] cover all resources

---
 .../java/ru/tinkoff/acquiring/sdk/Money.java  |  1 +
 .../acquiring/sdk/CardListFragment.java       |  4 +-
 .../acquiring/sdk/EnterCardFragment.java      | 41 ++++++++++---------
 .../sdk/inflate/pay/PayCellInflater.java      |  2 +-
 .../sdk/localization/AsdkLocalization.java    |  6 ++-
 .../sdk/localization/AsdkLocalizations.java   |  2 +-
 .../acquiring/sdk/localization/Optional.java  | 14 +++++++
 ui/src/main/res/layout/acq_activity_nfc.xml   |  2 +-
 ui/src/main/res/raw/acq_localization_en.json  |  8 ++--
 ui/src/main/res/raw/acq_localization_ru.json  |  8 ++--
 ui/src/main/res/values/ids.xml                |  3 +-
 11 files changed, 58 insertions(+), 33 deletions(-)
 create mode 100644 ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Optional.java

diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/Money.java b/core/src/main/java/ru/tinkoff/acquiring/sdk/Money.java
index 68a581c..747d307 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/Money.java
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/Money.java
@@ -87,6 +87,7 @@ private String formatFractionalPart(long fractional) {
         return String.format("%02d", fractional);
     }
 
+    @Deprecated
     public String toHumanReadableString() {
         return toString() + " P";
     }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
index 3471fd2..caf0832 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/CardListFragment.java
@@ -305,7 +305,7 @@ public void onDestroyActionMode(ActionMode mode) {
         @Override
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             menu
-                    .add(0, R.id.action_delete, 0,  AsdkLocalizations.require(CardListFragment.this).cardListDelete)
+                    .add(0, R.id.acq_action_delete, 0,  AsdkLocalizations.require(CardListFragment.this).cardListDelete)
                     .setIcon(R.drawable.acq_delete)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             return true;
@@ -313,7 +313,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            if (item.getItemId() != R.id.action_delete) {
+            if (item.getItemId() != R.id.acq_action_delete) {
                 return false;
             }
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
index 8373539..77428b1 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
@@ -59,7 +59,7 @@
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Locale;
+import java.util.IllegalFormatException;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -83,19 +83,6 @@ public class EnterCardFragment extends Fragment implements ICardInterest, ICharg
 
     private static final int PAY_FORM_MAX_LENGTH = 20;
 
-    private static final int AMOUNT_POSITION_INDEX = 0;
-    private static final int BUTTON_POSITION_INDEX = 1;
-    private static final int PAY_WITH_AMOUNT_FORMAT_INDEX = 2;
-    private static final int MONEY_AMOUNT_FORMAT_INDEX = 3;
-
-    private static final int AMOUNT_POSITION_OVER_FIELDS = 0;
-
-    private static final int BUTTON_UNDER_FIELDS_ICONS_ON_BOTTOM = 0;
-    private static final int ICONS_ON_BOTTOM_BUTTON_UNDER_ICONS = 1;
-    private static final int ICONS_UNDER_FIELDS_BUTTON_ON_BOTTOM = 2;
-    private static final int ICONS_UNDER_FIELDS_BUTTON_UNDER_ICONS = 3;
-    private static final int BUTTON_UNDER_FIELDS_ICONS_UNDER_BOTTOM = 4;
-
     private static final String RECURRING_TYPE_KEY = "recurringType";
     private static final String RECURRING_TYPE_VALUE = "12";
     private static final String FAIL_MAPI_SESSION_ID = "failMapiSessionId";
@@ -243,14 +230,30 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
         final Money amount = (Money) intent.getSerializableExtra(TAcqIntentExtra.EXTRA_AMOUNT);
 
-        String amountTextWithRubbles = amount != null ? amount.toHumanReadableString() : "";
-        String amountText = amount != null ? amount.toString() : ""; /* TODO*/
+        String amountText = amount != null ? amount.toString() : "";
 
         AsdkLocalization localization = AsdkLocalizations.require(this);
         if (tvAmount != null) {
-            tvAmount.setText(localization.payMoneyAmount);
+            try {
+                if (localization.payMoneyAmountFormat != null) {
+                    tvAmount.setText(String.format(localization.payMoneyAmountFormat, amountText));
+                } else {
+                    tvAmount.setText(amountText);
+                }
+            } catch (IllegalFormatException e) {
+                tvAmount.setText(amountText);
+            }
+        }
+
+        try {
+            if (localization.payPayButtonFormat != null) {
+                btnPay.setText(String.format(localization.payPayButtonFormat, amountText));
+            } else {
+                btnPay.setText(localization.payPayButton);
+            }
+        } catch (IllegalFormatException e) {
+            btnPay.setText(localization.payPayButton);
         }
-        btnPay.setText(localization.payPayButton);
 
         btnPay.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -649,7 +652,7 @@ public void run() {
                 } catch (Exception e) {
                     Throwable cause = e.getCause();
                     Message msg;
-                    if (cause != null && cause instanceof NetworkException) {
+                    if (cause instanceof NetworkException) {
                         msg = CommonSdkHandler.INSTANCE.obtainMessage(CommonSdkHandler.NO_NETWORK);
                     } else {
                         msg = CommonSdkHandler.INSTANCE.obtainMessage(CommonSdkHandler.EXCEPTION, e);
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
index cd23838..125c244 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
@@ -61,7 +61,7 @@ public View inflate(ViewGroup container) {
                     break;
                 case AMOUNT: {
                     View view = inflater.inflate(R.layout.acq_cell_amount, container, true);
-                    ((TextView)view.findViewById(R.id.tv_amount_label)).setText(localization.payMoneyAmount);
+                    ((TextView)view.findViewById(R.id.tv_amount_label)).setText(localization.payMoneyAmountLabel);
                     break;
                 }
                 case PAYMENT_CARD_REQUISITES: {
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
index 2d99226..30f5a72 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
@@ -25,12 +25,16 @@ public class AsdkLocalization {
 
     @SerializedName("Pay.Card.CvcHint") public String payCardCvcHint;
 
-    @SerializedName("Pay.Money.Amount") public String payMoneyAmount;
+    @SerializedName("Pay.Money.Amount.Label") public String payMoneyAmountLabel;
+
+    @SerializedName("Pay.Money.Amount.Format") @Optional public String payMoneyAmountFormat;
 
     @SerializedName("Pay.Email") public String payEmail;
 
     @SerializedName("Pay.PayButton") public String payPayButton;
 
+    @SerializedName("Pay.PayButton.Format") @Optional public String payPayButtonFormat;
+
     @SerializedName("Pay.Dialog.Error.Title") public String payDialogErrorTitle;
 
     @SerializedName("Pay.Dialog.Error.FallbackMessage") public String payDialogErrorFallbackMessage;
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
index 676063d..7f94a3e 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
@@ -156,7 +156,7 @@ private static void ensureLocalization(AsdkLocalization localization) {
             if (serializedName == null) continue;
 
             try {
-                if (field.get(localization) == null) {
+                if (field.get(localization) == null && field.getAnnotation(Optional.class) == null) {
                     missing.add(serializedName.value());
                 }
             } catch (IllegalAccessException e) {
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Optional.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Optional.java
new file mode 100644
index 0000000..79f2b76
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/Optional.java
@@ -0,0 +1,14 @@
+package ru.tinkoff.acquiring.sdk.localization;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author a.shishkin1
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@interface Optional {
+}
diff --git a/ui/src/main/res/layout/acq_activity_nfc.xml b/ui/src/main/res/layout/acq_activity_nfc.xml
index cb7bde8..722963b 100644
--- a/ui/src/main/res/layout/acq_activity_nfc.xml
+++ b/ui/src/main/res/layout/acq_activity_nfc.xml
@@ -11,7 +11,7 @@
     <LinearLayout
         style="@style/AcquiringNfcDescriptionTextStyle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:gravity="center"
         android:orientation="vertical">
diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index 1637a7a..bb59224 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -8,9 +8,11 @@
   "Pay.Card.PanHint.Recurrent": "Choose card",
   "Pay.Card.ExpireDateHint": "MM/YY",
   "Pay.Card.CvcHint": "CVC",
-  "Pay.Money.Amount": " ",
+  "Pay.Money.Amount.Label": " ",
+  "Pay.Money.Amount.Format": "%s P",
   "Pay.Email": "E-mail for receipt",
   "Pay.PayButton": "Pay",
+  "Pay.PayButton.Format": "Pay %s Р",
   "Pay.Dialog.Error.Title": "Error",
   "Pay.Dialog.Error.FallbackMessage": "Something went wrong",
   "Pay.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
@@ -21,8 +23,8 @@
   "Pay.Dialog.Progress.PayMessage": "Payment…",
   "Pay.Dialog.CardScan.Nfc": "Scan with NFC",
   "Pay.Dialog.CardScan.Camera": "Scan with camera",
-  "Pay.Dialog.Сvc.Message": "To complete payment, enter CVC",
-  "Pay.Dialog.Сvc.AcceptButton": "OK",
+  "Pay.Dialog.Cvc.Message": "To complete payment, enter CVC",
+  "Pay.Dialog.Cvc.AcceptButton": "OK",
   "Pay.Nfc.Fail": " ",
   "Pay.NoScanProviders": " ",
   "ConfirmationLoop.Title": " ",
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index af6d83d..795a3d0 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -8,9 +8,11 @@
   "Pay.Card.PanHint.Recurrent": "Выберите карту из привязанных",
   "Pay.Card.ExpireDateHint": "ММ/ГГ",
   "Pay.Card.CvcHint": "CVC",
-  "Pay.Money.Amount": "На сумму:",
+  "Pay.Money.Amount.Label": "На сумму:",
+  "Pay.Money.Amount.Format": "%s P",
   "Pay.Email": "E-mail для квитанции",
   "Pay.PayButton": "Оплатить",
+  "Pay.PayButton.Format": "Оплатить %s Р",
   "Pay.Dialog.Error.Title": "Ошибка",
   "Pay.Dialog.Error.FallbackMessage": "Что-то пошло не так",
   "Pay.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
@@ -21,8 +23,8 @@
   "Pay.Dialog.Progress.PayMessage": "Оплата…",
   "Pay.Dialog.CardScan.Nfc": "Сканировать по NFC",
   "Pay.Dialog.CardScan.Camera": "Сканировать камерой",
-  "Pay.Dialog.Сvc.Message": " ",
-  "Pay.Dialog.Сvc.AcceptButton": "OK",
+  "Pay.Dialog.Cvc.Message": " ",
+  "Pay.Dialog.Cvc.AcceptButton": "OK",
   "Pay.Nfc.Fail": " ",
   "Pay.NoScanProviders": " ",
   "ConfirmationLoop.Title": "Оплата",
diff --git a/ui/src/main/res/values/ids.xml b/ui/src/main/res/values/ids.xml
index 78fd0e6..535a110 100644
--- a/ui/src/main/res/values/ids.xml
+++ b/ui/src/main/res/values/ids.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-
-    <item name="action_delete" type="id"/>
+    <item name="acq_action_delete" type="id"/>
 
 </resources>
\ No newline at end of file

From 56bb2afd27c5ebca86c83c307d64a7ce8fc4492e Mon Sep 17 00:00:00 2001
From: al-dr <al-drmail@mail.ru>
Date: Thu, 13 Dec 2018 01:22:11 +0300
Subject: [PATCH 03/13] localization testing

---
 .../acquiring/sample/ui/PayableActivity.java  |  2 +
 sample/src/main/res/raw/custom.json           | 51 +++++++++++++++++++
 .../acquiring/sdk/EnterCardFragment.java      | 20 +++++---
 .../sdk/LoopConfirmationFragment.java         |  4 +-
 .../sdk/inflate/pay/PayCellInflater.java      |  6 ++-
 ui/src/main/res/raw/acq_localization_en.json  |  2 +-
 ui/src/main/res/raw/acq_localization_ru.json  |  2 +-
 7 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 sample/src/main/res/raw/custom.json

diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
index 99bd708..b568ee3 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
@@ -32,6 +32,7 @@
 import ru.tinkoff.acquiring.sample.SettingsSdkManager;
 import ru.tinkoff.acquiring.sdk.GooglePayParams;
 import ru.tinkoff.acquiring.sdk.Item;
+import ru.tinkoff.acquiring.sdk.Language;
 import ru.tinkoff.acquiring.sdk.Money;
 import ru.tinkoff.acquiring.sdk.OnPaymentListener;
 import ru.tinkoff.acquiring.sdk.PayFormActivity;
@@ -134,6 +135,7 @@ protected void initPayment(final Money amount,
                 .setChargeMode(settings.isRecurrentPayment())
                 .useFirstAttachedCard(settings.useFirstAttachedCard())
                 .setCameraCardScanner(settings.getCameraScanner())
+                .setLanguage(Language.RUSSIAN)
                 //.setReceipt(createReceipt())
                 //.setData(createData())
                 .setTheme(settings.resolveStyle())
diff --git a/sample/src/main/res/raw/custom.json b/sample/src/main/res/raw/custom.json
new file mode 100644
index 0000000..b1bb742
--- /dev/null
+++ b/sample/src/main/res/raw/custom.json
@@ -0,0 +1,51 @@
+{
+  "Pay.Title": "Оплата",
+  "Pay.Card.NewCard": "Новая карта",
+  "Pay.Card.SavedCard": "Сохраненная карта",
+  "Pay.Card.ChangeCard": "Другая",
+  "Pay.Card.ChooseLinkedCard": "Выберите карту из привязанных",
+  "Pay.Card.PanHint": "Номер карты",
+  "Pay.Card.PanHint.Recurrent": "Выберите карту из привязанных",
+  "Pay.Card.ExpireDateHint": "ММ/ГГ",
+  "Pay.Card.CvcHint": "CVC",
+  "Pay.Money.Amount.Label": "На сумму:",
+  "Pay.Email": "E-mail для квитанции",
+  "Pay.PayButton": "Оплатить",
+  "Pay.Dialog.Error.Title": "Ошибка",
+  "Pay.Dialog.Error.FallbackMessage": "Что-то пошло не так",
+  "Pay.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
+  "Pay.Dialog.Error.AcceptButton": "OK",
+  "Pay.Dialog.Validation.Title": " ",
+  "Pay.Dialog.Validation.InvalidEmail": "Введен некорректный e-mail",
+  "Pay.Dialog.Validation.InvalidCard": "Введены некорректные данные карты",
+  "Pay.Dialog.Progress.PayMessage": "Оплата…",
+  "Pay.Dialog.CardScan.Nfc": "Сканировать по NFC",
+  "Pay.Dialog.CardScan.Camera": "Сканировать камерой",
+  "Pay.Dialog.Cvc.Message": " ",
+  "Pay.Dialog.Cvc.AcceptButton": "OK",
+  "Pay.Nfc.Fail": " ",
+  "Pay.NoScanProviders": " ",
+  "ConfirmationLoop.Title": "Оплата",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Amount": "Заблокированная сумма",
+  "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
+  "ConfirmationLoop.CheckButton": "Проверить",
+  "Confirmation3DS.Title": "Оплата",
+  "AddCard.Title": "Добавление карты",
+  "AddCard.AddCardButton": "Добавить",
+  "AddCard.Dialog.Error.Title": "Ошибка",
+  "AddCard.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
+  "AddCard.Nfc.Fail": " ",
+  "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
+  "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
+  "AddCard.NoScanProviders": " ",
+  "CardList.Title": "Выберите карту",
+  "CardList.NewCard": "Ввести данные новой карты",
+  "CardList.Delete": "Удалить",
+  "CardList.RemoveCard.FailMessage": "Не удалось удалить карту, попробуйте позже",
+  "Nfc.Title": " ",
+  "Nfc.Description": "Поднесите карту\\nк задней крышке телефона",
+  "Nfc.CloseButton": "Закрыть",
+  "Nfc.Dialog.Disable.Title": " ",
+  "Nfc.Dialog.Disable.Message": " "
+}
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
index 77428b1..9a73fcf 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/EnterCardFragment.java
@@ -443,18 +443,26 @@ private String getFormattedPrice() {
     }
 
     private void setRecurrentModeForCardView(boolean recurrentMode) {
+        AsdkLocalization localization = AsdkLocalizations.require(this);
         if (recurrentMode) {
-            AsdkLocalization localization = AsdkLocalizations.require(this);
             ecvCard.setEnabled(false);
             ecvCard.setFocusable(false);
             ecvCard.clearFocus();
             ecvCard.setFullCardNumberModeEnable(false);
-            ecvCard.setCardHint(localization.payCardPanHintRecurrent);
+            ecvCard.setHints(
+                    localization.payCardPanHintRecurrent,
+                    localization.payCardExpireDateHint,
+                    localization.payCardCvcHint
+            );
         } else {
             ecvCard.setEnabled(true);
             ecvCard.setFocusable(true);
             ecvCard.setFullCardNumberModeEnable(true);
-            ecvCard.setCardHint(ecvCard.getCardNumberHint());
+            ecvCard.setHints(
+                    localization.payCardPanHint,
+                    localization.payCardExpireDateHint,
+                    localization.payCardCvcHint
+            );
         }
     }
 
@@ -677,7 +685,7 @@ public void run() {
                 boolean hasCard = sourceCard != null;
                 boolean needClearCardView = needClearCardView(activity);
                 srcCardChooser.setVisibility(cards != null && cards.length > 0 ? View.VISIBLE : View.GONE);
-                tvSrcCardLabel.setText(getLabel(chargeMode, hasCard));
+                tvSrcCardLabel.setText(getLabel(hasCard));
                 if (chargeMode) {
                     if (hasCard) {
                         ecvCard.setRecurrentPaymentMode(true);
@@ -751,12 +759,10 @@ private boolean needClearCardView(PayFormActivity activity) {
         return bundle != null;
     }
 
-    private String getLabel(boolean chargeMode, boolean hasCard) {
+    private String getLabel(boolean hasCard) {
         AsdkLocalization localization = AsdkLocalizations.require(this);
         if (hasCard) {
             return localization.payCardSavedCard;
-        } else if (chargeMode) {
-            return "";
         } else {
             return localization.payCardNewCard;
         }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
index 6615e11..2a7c2ce 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/LoopConfirmationFragment.java
@@ -57,8 +57,8 @@ public void onAttach(Context context) {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.acq_fragment_loop_confirmation, container, false);
         AsdkLocalization localization = AsdkLocalizations.require(this);
-        ((TextView) root.findViewById(R.id.tv_title)).setText(localization.confirmationLoopTitle);
-        ((TextView) root.findViewById(R.id.et_amount)).setText(localization.confirmationLoopDescription);
+        ((TextView) root.findViewById(R.id.tv_title)).setText(localization.confirmationLoopDescription);
+        ((EditText) root.findViewById(R.id.et_amount)).setHint(localization.confirmationLoopAmount);
         ((TextView) root.findViewById(R.id.btn_check)).setText(localization.confirmationLoopCheckButton);
         initViews(root);
         resolveButtonAndIconsPosition(root);
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
index 125c244..08bf965 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/pay/PayCellInflater.java
@@ -69,9 +69,11 @@ public View inflate(ViewGroup container) {
                     ((TextView)view.findViewById(R.id.tv_src_card_choose_btn)).setText(localization.payCardChangeCard);
                     break;
                 }
-                case EMAIL:
-                    inflater.inflate(R.layout.acq_cell_email, container, true);
+                case EMAIL: {
+                    View view = inflater.inflate(R.layout.acq_cell_email, container, true);
+                    ((TextView) view.findViewById(R.id.et_email)).setHint(localization.payEmail);
                     break;
+                }
                 case PAY_BUTTON:
                     inflater.inflate(R.layout.acq_cell_pay_button, container, true);
                     break;
diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index bb59224..ff4cee5 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -28,7 +28,7 @@
   "Pay.Nfc.Fail": " ",
   "Pay.NoScanProviders": " ",
   "ConfirmationLoop.Title": " ",
-  "ConfirmationLoop.Description": "In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ?)/ Please, specify the sum with accuracy to amount of coins.",
+  "ConfirmationLoop.Description": "In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ?)\n Please, specify the sum with accuracy to amount of coins.",
   "ConfirmationLoop.Amount": "Blocked amount",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Please enter correct amount in coins",
   "ConfirmationLoop.CheckButton": "Check",
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index 795a3d0..480e317 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -28,7 +28,7 @@
   "Pay.Nfc.Fail": " ",
   "Pay.NoScanProviders": " ",
   "ConfirmationLoop.Title": "Оплата",
-  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
   "ConfirmationLoop.CheckButton": "Проверить",

From 6e0f2c6c0d5b56d174a9d11501ab1b0af289ea6a Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Mon, 28 Jan 2019 15:18:17 +0300
Subject: [PATCH 04/13] =?UTF-8?q?ASDK-460=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B4=D0=B6=D0=B8=D1=81=D0=BE=D0=BD=D1=8B?=
 =?UTF-8?q?=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B8=20=D1=81=20=D0=B2=D0=B8=D0=BA=D0=B8=20?=
 =?UTF-8?q?https://wiki.tcsbank.ru/pages/viewpage.action=3FpageId=3D308753?=
 =?UTF-8?q?045?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/main/res/raw/acq_localization_en.json | 22 ++++++++++----------
 ui/src/main/res/raw/acq_localization_ru.json | 12 +++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index ff4cee5..21f0436 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -1,5 +1,5 @@
 {
-  "Pay.Title": " ",
+  "Pay.Title": "Payment",
   "Pay.Card.NewCard": "New card",
   "Pay.Card.SavedCard": "Linked card",
   "Pay.Card.ChangeCard": "Change",
@@ -8,7 +8,7 @@
   "Pay.Card.PanHint.Recurrent": "Choose card",
   "Pay.Card.ExpireDateHint": "MM/YY",
   "Pay.Card.CvcHint": "CVC",
-  "Pay.Money.Amount.Label": " ",
+  "Pay.Money.Amount.Label": "Amount",
   "Pay.Money.Amount.Format": "%s P",
   "Pay.Email": "E-mail for receipt",
   "Pay.PayButton": "Pay",
@@ -25,29 +25,29 @@
   "Pay.Dialog.CardScan.Camera": "Scan with camera",
   "Pay.Dialog.Cvc.Message": "To complete payment, enter CVC",
   "Pay.Dialog.Cvc.AcceptButton": "OK",
-  "Pay.Nfc.Fail": " ",
-  "Pay.NoScanProviders": " ",
-  "ConfirmationLoop.Title": " ",
+  "Pay.Nfc.Fail": "Failed to scan a card",
+  "Pay.NoScanProviders": "There aren't any providers",
+  "ConfirmationLoop.Title": "Payment",
   "ConfirmationLoop.Description": "In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ?)\n Please, specify the sum with accuracy to amount of coins.",
   "ConfirmationLoop.Amount": "Blocked amount",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Please enter correct amount in coins",
   "ConfirmationLoop.CheckButton": "Check",
-  "Confirmation3DS.Title": " ",
+  "Confirmation3DS.Title": "Payment",
   "AddCard.Title": "Add card",
   "AddCard.AddCardButton": "Add card",
   "AddCard.Dialog.Error.Title": "Error",
   "AddCard.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
-  "AddCard.Nfc.Fail": " ",
+  "AddCard.Nfc.Fail": "Failed to scan a card",
   "AddCard.Dialog.Progress.AddCardMessage": "Attaching card…",
   "AddCard.Dialog.Error.FallbackMessage": "Something went wrong",
-  "AddCard.NoScanProviders": " ",
+  "AddCard.NoScanProviders": "There aren't any providers",
   "CardList.Title": "Select card",
   "CardList.NewCard": "Add new card",
   "CardList.Delete": "Delete",
-  "CardList.RemoveCard.FailMessage": " ",
+  "CardList.RemoveCard.FailMessage": "Unable to remove the card, try again later",
   "Nfc.Title": " ",
   "Nfc.Description": "Bring the card to the back of the phone",
   "Nfc.CloseButton": "Close",
-  "Nfc.Dialog.Disable.Title": " ",
-  "Nfc.Dialog.Disable.Message": " "
+  "Nfc.Dialog.Disable.Title": "NFC is switched off",
+  "Nfc.Dialog.Disable.Message": "Turn on NFC to scan a card"
 }
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index 480e317..35a2eca 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -23,10 +23,10 @@
   "Pay.Dialog.Progress.PayMessage": "Оплата…",
   "Pay.Dialog.CardScan.Nfc": "Сканировать по NFC",
   "Pay.Dialog.CardScan.Camera": "Сканировать камерой",
-  "Pay.Dialog.Cvc.Message": " ",
+  "Pay.Dialog.Cvc.Message": "Для совершения платежа, введите CVC",
   "Pay.Dialog.Cvc.AcceptButton": "OK",
-  "Pay.Nfc.Fail": " ",
-  "Pay.NoScanProviders": " ",
+  "Pay.Nfc.Fail": "Не удалось распознать карту",
+  "Pay.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "ConfirmationLoop.Title": "Оплата",
   "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",
@@ -37,7 +37,7 @@
   "AddCard.AddCardButton": "Добавить",
   "AddCard.Dialog.Error.Title": "Ошибка",
   "AddCard.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
-  "AddCard.Nfc.Fail": " ",
+  "AddCard.Nfc.Fail": "Не удалось распознать карту",
   "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
   "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
   "AddCard.NoScanProviders": " ",
@@ -48,6 +48,6 @@
   "Nfc.Title": " ",
   "Nfc.Description": "Поднесите карту\\nк задней крышке телефона",
   "Nfc.CloseButton": "Закрыть",
-  "Nfc.Dialog.Disable.Title": " ",
-  "Nfc.Dialog.Disable.Message": " "
+  "Nfc.Dialog.Disable.Title": "NFC выключен",
+  "Nfc.Dialog.Disable.Message": "Для сканирования карты необходимо включить NFC"
 }

From 26a5bbd6b54fe0d0b4f8b4bdbd7bb967eb7d2d67 Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Mon, 28 Jan 2019 20:30:48 +0300
Subject: [PATCH 05/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

пробросил в локализацию в сканнер
---
 .../sdk/card/io/CameraCardIOScanner.java        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/card-io/src/main/java/ru/tinkoff/acquiring/sdk/card/io/CameraCardIOScanner.java b/card-io/src/main/java/ru/tinkoff/acquiring/sdk/card/io/CameraCardIOScanner.java
index bf95453..44f2f7b 100644
--- a/card-io/src/main/java/ru/tinkoff/acquiring/sdk/card/io/CameraCardIOScanner.java
+++ b/card-io/src/main/java/ru/tinkoff/acquiring/sdk/card/io/CameraCardIOScanner.java
@@ -11,6 +11,8 @@
 import ru.tinkoff.acquiring.sdk.CreditCard;
 import ru.tinkoff.acquiring.sdk.ICameraCardScanner;
 import ru.tinkoff.acquiring.sdk.ICreditCard;
+import ru.tinkoff.acquiring.sdk.Language;
+import ru.tinkoff.acquiring.sdk.TAcqIntentExtra;
 
 /**
  * @author Vitaliy Markus
@@ -22,6 +24,7 @@ public void startActivityForScanning(Fragment fragment, int requestCode) {
         Intent scanIntent = createIntent(fragment.getActivity());
         fragment.startActivityForResult(scanIntent, requestCode);
     }
+
     @Override
     public boolean hasResult(@NonNull Intent data) {
         return data.hasExtra(CardIOActivity.EXTRA_SCAN_RESULT);
@@ -52,8 +55,20 @@ private Intent createIntent(Activity activity) {
         scanIntent.putExtra(CardIOActivity.EXTRA_REQUIRE_CVV, false);
         scanIntent.putExtra(CardIOActivity.EXTRA_REQUIRE_POSTAL_CODE, false);
         scanIntent.putExtra(CardIOActivity.EXTRA_SUPPRESS_CONFIRMATION, true);
+        setLanguageOrLocale(activity, scanIntent);
         return scanIntent;
     }
-    
+
+    private void setLanguageOrLocale(Activity activity, Intent scanIntent) {
+        Intent intent = activity.getIntent();
+        if (intent == null) {
+            return;
+        }
+        int languageExtra = intent.getIntExtra(TAcqIntentExtra.EXTRA_LANGUAGE, -1);
+        if (languageExtra != -1) {
+            Language language = Language.values()[languageExtra];
+            scanIntent.putExtra(CardIOActivity.EXTRA_LANGUAGE_OR_LOCALE, language.toString());
+        }
+    }
 }
 

From 8f490b3bdb0141455cba802336b67e11c6a7ad00 Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Tue, 29 Jan 2019 12:13:14 +0300
Subject: [PATCH 06/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Сделал метод обогощения интента TAcq флагами
Пробросил данные для локализации в NFC активити
---
 .../acquiring/sdk/FullCardScanner.java        |  1 +
 .../sdk/localization/AsdkLocalizations.java   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
index 1bd453d..7a86713 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/FullCardScanner.java
@@ -119,6 +119,7 @@ private void startCameraScan() {
 
     private void startNfcScan(Activity activity) {
         Intent cardFromNfcIntent = new Intent(activity, AsdkNfcScanActivity.class);
+        AsdkLocalizations.joinTAcqExtra(cardFromNfcIntent, activity.getIntent());
         fragment.startActivityForResult(cardFromNfcIntent, REQUEST_CARD_NFC);
     }
 }
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
index 7f94a3e..6103e0f 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalizations.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.Intent;
 import android.os.Build;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
@@ -40,6 +41,13 @@ public static  AsdkLocalization require(Context context) {
         }
     }
 
+    public static void joinTAcqExtra(Intent mainIntent, Intent intentWithTAcq) {
+        setTAcqExtraInt(mainIntent, intentWithTAcq, TAcqIntentExtra.EXTRA_LOCALIZATION_RAW_RESOURCE_ID, 0);
+        setTAcqExtraInt(mainIntent, intentWithTAcq, TAcqIntentExtra.EXTRA_LANGUAGE, -1);
+        setTAcqExtraString(mainIntent, intentWithTAcq, TAcqIntentExtra.EXTRA_LOCALIZATION_FILE_PATH);
+        setTAcqExtraString(mainIntent, intentWithTAcq, "json");
+    }
+
     static AsdkLocalization unsafeGet(Context context) {
         Context activityCandidate = context;
         while (!(activityCandidate instanceof Activity)) {
@@ -169,4 +177,15 @@ private static void ensureLocalization(AsdkLocalization localization) {
         throw new IllegalArgumentException("localization must contains: " + TextUtils.join(", ", missing));
     }
 
+    private static void setTAcqExtraInt(Intent mainIntent, Intent tAcqIntentExtra, String asdkDataKey, int defaultValue) {
+        int extra = tAcqIntentExtra.getIntExtra(asdkDataKey, defaultValue);
+        mainIntent.putExtra(asdkDataKey, extra);
+    }
+
+    private static void setTAcqExtraString(Intent mainIntent, Intent tAcqIntentExtra, String asdkDataKey) {
+        String extra = tAcqIntentExtra.getStringExtra(asdkDataKey);
+        if (extra != null) {
+            mainIntent.putExtra(asdkDataKey, extra);
+        }
+    }
 }

From 95f5648b9806e2ca9990e28f6beabc0baa5e1772 Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Wed, 30 Jan 2019 12:32:42 +0300
Subject: [PATCH 07/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Расширил json модели для локализации
фиксанул инфлейторы
---
 .../acquiring/sample/ui/MainActivity.java     |  1 -
 .../acquiring/sample/ui/PayableActivity.java  |  1 -
 sample/src/main/res/values/style_custom.xml   |  4 ++--
 .../inflate/attach/AttachCellInflater.java    | 20 ++++++++++++-------
 .../sdk/localization/AsdkLocalization.java    |  4 ++++
 ui/src/main/res/raw/acq_localization_en.json  |  2 ++
 ui/src/main/res/raw/acq_localization_ru.json  |  2 ++
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
index b81196d..a2c52e6 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.java
@@ -82,7 +82,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 AttachCardFormActivity
                         .init(params.terminalId, params.secret, params.publicKey)
                         .prepare(params.customerKey, settings.getCheckType(), settings.isCustomKeyboardEnabled(), params.customerEmail)
-                        .setLanguage(Language.RUSSIAN)
                         .setTheme(settings.resolveAttachCardStyle())
                         .setCameraCardScanner(settings.getCameraScanner())
 //                        .setDesignConfiguration(AttachCellType.ATTACH_BUTTON, AttachCellType.SECURE_LOGOS, AttachCellType.PAYMENT_CARD_REQUISITES)
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
index ddfb2f6..b76ae51 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.java
@@ -135,7 +135,6 @@ protected void initPayment(final Money amount,
                 .setChargeMode(settings.isRecurrentPayment())
                 .useFirstAttachedCard(settings.useFirstAttachedCard())
                 .setCameraCardScanner(settings.getCameraScanner())
-                .setLanguage(Language.ENGLISH)
                 //.setReceipt(createReceipt())
                 //.setData(createData())
                 .setTheme(settings.resolveStyle())
diff --git a/sample/src/main/res/values/style_custom.xml b/sample/src/main/res/values/style_custom.xml
index 702c88a..237c930 100644
--- a/sample/src/main/res/values/style_custom.xml
+++ b/sample/src/main/res/values/style_custom.xml
@@ -91,11 +91,11 @@
     </style>
 
     <style name="AcquiringPayTitleStyle.AttachCard">
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="AcquiringPayDescriptionStyle.AttachCard">
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="AcquiringPayButtonStyle.AttachCard" parent="AcquiringButtonStyle">
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
index d9a6628..bf5e200 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/inflate/attach/AttachCellInflater.java
@@ -50,20 +50,26 @@ public View inflate(ViewGroup container) {
         AsdkLocalization localization = AsdkLocalizations.require(container.getContext());
         View root = inflater.inflate(R.layout.acq_fragment_attach_card_base, container, false);
         container = root.findViewById(R.id.ll_container_layout);
+        View inflatedView = null;
         for (AttachCellType cellType : cellTypes) {
             switch (cellType) {
-                case TITLE:
-                    inflater.inflate(R.layout.acq_cell_product_title, container, true);
+                case TITLE: {
+                    inflatedView = inflater.inflate(R.layout.acq_cell_product_title, container, true);
+                    ((TextView) inflatedView.findViewById(R.id.tv_title)).setText(localization.addCardAttachmentTitle);
                     break;
-                case DESCRIPTION:
-                    inflater.inflate(R.layout.acq_cell_product_description, container, true);
+                }
+                case DESCRIPTION: {
+                    inflatedView = inflater.inflate(R.layout.acq_cell_product_description, container, true);
+                    ((TextView) inflatedView.findViewById(R.id.tv_description)).setText(localization.addCardAttachmentDescription);
                     break;
-                case PAYMENT_CARD_REQUISITES:
+                }
+                case PAYMENT_CARD_REQUISITES: {
                     inflater.inflate(R.layout.acq_cell_payment_card_requisites_attach, container, true);
                     break;
+                }
                 case EMAIL: {
-                    View view = inflater.inflate(R.layout.acq_cell_email, container, true);
-                    ((TextView) view.findViewById(R.id.et_email)).setHint(localization.payEmail);
+                    inflatedView = inflater.inflate(R.layout.acq_cell_email, container, true);
+                    ((TextView) inflatedView.findViewById(R.id.et_email)).setHint(localization.payEmail);
                     break;
                 }
                 case ATTACH_BUTTON:
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
index 30f5a72..f5cfd49 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/localization/AsdkLocalization.java
@@ -77,6 +77,10 @@ public class AsdkLocalization {
 
     @SerializedName("AddCard.Title") public String addCardTitle;
 
+    @SerializedName("AddCard.Attachment.Title") public String addCardAttachmentTitle;
+
+    @SerializedName("AddCard.Attachment.Description") public String addCardAttachmentDescription;
+
     @SerializedName("AddCard.AddCardButton") public String addCardAddCardButton;
 
     @SerializedName("AddCard.Dialog.Error.Title") public String addCardDialogErrorTitle;
diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index 21f0436..170477e 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -34,6 +34,8 @@
   "ConfirmationLoop.CheckButton": "Check",
   "Confirmation3DS.Title": "Payment",
   "AddCard.Title": "Add card",
+  "AddCard.Attachment.Title": "Attachment Title",
+  "AddCard.Attachment.Description": "Attachment Descriptions",
   "AddCard.AddCardButton": "Add card",
   "AddCard.Dialog.Error.Title": "Error",
   "AddCard.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index d3203e9..37f09ff 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -34,6 +34,8 @@
   "ConfirmationLoop.CheckButton": "Проверить",
   "Confirmation3DS.Title": "Оплата",
   "AddCard.Title": "Добавление карты",
+  "AddCard.Attachment.Title": "Заголовок привязки карты",
+  "AddCard.Attachment.Description": "Описание привязки карты",
   "AddCard.AddCardButton": "Добавить",
   "AddCard.Dialog.Error.Title": "Ошибка",
   "AddCard.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",

From cd06f556a0f8f53518fc3ae7862a6c73b19fcbff Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Wed, 30 Jan 2019 14:36:21 +0300
Subject: [PATCH 08/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил значения в файл для кастомизации
---
 sample/src/main/res/raw/custom.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sample/src/main/res/raw/custom.json b/sample/src/main/res/raw/custom.json
index b1bb742..d2ce9fe 100644
--- a/sample/src/main/res/raw/custom.json
+++ b/sample/src/main/res/raw/custom.json
@@ -21,12 +21,12 @@
   "Pay.Dialog.Progress.PayMessage": "Оплата…",
   "Pay.Dialog.CardScan.Nfc": "Сканировать по NFC",
   "Pay.Dialog.CardScan.Camera": "Сканировать камерой",
-  "Pay.Dialog.Cvc.Message": " ",
+  "Pay.Dialog.Cvc.Message": "Для совершения платежа, введите CVC",
   "Pay.Dialog.Cvc.AcceptButton": "OK",
-  "Pay.Nfc.Fail": " ",
+  "Pay.Nfc.Fail": "Не удалось распознать карту",
   "Pay.NoScanProviders": " ",
   "ConfirmationLoop.Title": "Оплата",
-  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
   "ConfirmationLoop.CheckButton": "Проверить",
@@ -35,7 +35,7 @@
   "AddCard.AddCardButton": "Добавить",
   "AddCard.Dialog.Error.Title": "Ошибка",
   "AddCard.Dialog.Error.Network": "Вероятно, соединение с интернетом прервано, попробуйте позже",
-  "AddCard.Nfc.Fail": " ",
+  "AddCard.Nfc.Fail": "Не удалось распознать карту",
   "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
   "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
   "AddCard.NoScanProviders": " ",
@@ -44,8 +44,8 @@
   "CardList.Delete": "Удалить",
   "CardList.RemoveCard.FailMessage": "Не удалось удалить карту, попробуйте позже",
   "Nfc.Title": " ",
-  "Nfc.Description": "Поднесите карту\\nк задней крышке телефона",
+  "Nfc.Description": "Поднесите карту\nк задней крышке телефона",
   "Nfc.CloseButton": "Закрыть",
-  "Nfc.Dialog.Disable.Title": " ",
-  "Nfc.Dialog.Disable.Message": " "
+  "Nfc.Dialog.Disable.Title": "NFC выключен",
+  "Nfc.Dialog.Disable.Message": "Для сканирования карты необходимо включить NFC"
 }

From d6163e22acc22be154c87c4d8d36586def381c64 Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Wed, 30 Jan 2019 14:47:25 +0300
Subject: [PATCH 09/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил значения для AddCard.NoScanProviders
---
 sample/src/main/res/raw/custom.json          | 2 +-
 ui/src/main/res/raw/acq_localization_ru.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sample/src/main/res/raw/custom.json b/sample/src/main/res/raw/custom.json
index d2ce9fe..abb83c1 100644
--- a/sample/src/main/res/raw/custom.json
+++ b/sample/src/main/res/raw/custom.json
@@ -38,7 +38,7 @@
   "AddCard.Nfc.Fail": "Не удалось распознать карту",
   "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
   "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
-  "AddCard.NoScanProviders": " ",
+  "AddCard.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "CardList.Title": "Выберите карту",
   "CardList.NewCard": "Ввести данные новой карты",
   "CardList.Delete": "Удалить",
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index 37f09ff..685f766 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -42,7 +42,7 @@
   "AddCard.Nfc.Fail": "Не удалось распознать карту",
   "AddCard.Dialog.Progress.AddCardMessage": "Добавление карты...",
   "AddCard.Dialog.Error.FallbackMessage": "Что-то пошло не так",
-  "AddCard.NoScanProviders": " ",
+  "AddCard.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "CardList.Title": "Выберите карту",
   "CardList.NewCard": "Ввести данные новой карты",
   "CardList.Delete": "Удалить",

From 2403aa706ea8eadf83c637077e49fc5216db963c Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Wed, 30 Jan 2019 14:57:33 +0300
Subject: [PATCH 10/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

вернул невидимость для дефолтного стиля
---
 sample/src/main/res/values/style_custom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sample/src/main/res/values/style_custom.xml b/sample/src/main/res/values/style_custom.xml
index 237c930..87969c0 100644
--- a/sample/src/main/res/values/style_custom.xml
+++ b/sample/src/main/res/values/style_custom.xml
@@ -21,7 +21,8 @@
     <style name="AcquiringTheme.Custom.AttachCard">
         <item name="acqPayAmountPosition">overFields</item>
         <item name="acqPayTitleStyle">@style/AcquiringPayTitleStyle.Custom.AttachCard</item>
-        <item name="acqPayDescriptionStyle">@style/AcquiringPayDescriptionStyle.Custom.AttachCard</item>
+        <item name="acqPayDescriptionStyle">@style/AcquiringPayDescriptionStyle.Custom.AttachCard
+        </item>
         <item name="acqButtonStyle">@style/AcquiringPayButtonStyle.Custom.AttachCard</item>
     </style>
 
@@ -91,11 +92,11 @@
     </style>
 
     <style name="AcquiringPayTitleStyle.AttachCard">
-        <item name="android:visibility">visible</item>
+        <item name="android:visibility">gone</item>
     </style>
 
     <style name="AcquiringPayDescriptionStyle.AttachCard">
-        <item name="android:visibility">visible</item>
+        <item name="android:visibility">gone</item>
     </style>
 
     <style name="AcquiringPayButtonStyle.AttachCard" parent="AcquiringButtonStyle">

From 12f2135c72dbfe87d00bc3b42939d0619510211d Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Thu, 31 Jan 2019 10:52:44 +0300
Subject: [PATCH 11/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pay.NoScanProviders для кастомизации
---
 sample/src/main/res/raw/custom.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample/src/main/res/raw/custom.json b/sample/src/main/res/raw/custom.json
index abb83c1..78df8eb 100644
--- a/sample/src/main/res/raw/custom.json
+++ b/sample/src/main/res/raw/custom.json
@@ -24,7 +24,7 @@
   "Pay.Dialog.Cvc.Message": "Для совершения платежа, введите CVC",
   "Pay.Dialog.Cvc.AcceptButton": "OK",
   "Pay.Nfc.Fail": "Не удалось распознать карту",
-  "Pay.NoScanProviders": " ",
+  "Pay.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "ConfirmationLoop.Title": "Оплата",
   "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",

From cc75e3a8702d548c7376e94fb02eb4d6e5af0c94 Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Thu, 31 Jan 2019 13:15:51 +0300
Subject: [PATCH 12/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил значения английской локализации
---
 ui/src/main/res/raw/acq_localization_en.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index 170477e..d8c9423 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -4,7 +4,7 @@
   "Pay.Card.SavedCard": "Linked card",
   "Pay.Card.ChangeCard": "Change",
   "Pay.Card.ChooseLinkedCard": "Choose card",
-  "Pay.Card.PanHint": "PAN",
+  "Pay.Card.PanHint": "Card number",
   "Pay.Card.PanHint.Recurrent": "Choose card",
   "Pay.Card.ExpireDateHint": "MM/YY",
   "Pay.Card.CvcHint": "CVC",
@@ -15,7 +15,7 @@
   "Pay.PayButton.Format": "Pay %s Р",
   "Pay.Dialog.Error.Title": "Error",
   "Pay.Dialog.Error.FallbackMessage": "Something went wrong",
-  "Pay.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
+  "Pay.Dialog.Error.Network": "Probably the Internet connection was interrupted, try again later",
   "Pay.Dialog.Error.AcceptButton": "OK",
   "Pay.Dialog.Validation.Title": " ",
   "Pay.Dialog.Validation.InvalidEmail": "Invalid e-mail",
@@ -28,7 +28,7 @@
   "Pay.Nfc.Fail": "Failed to scan a card",
   "Pay.NoScanProviders": "There aren't any providers",
   "ConfirmationLoop.Title": "Payment",
-  "ConfirmationLoop.Description": "In order to confirm the binding of your card we wrote off and returned a small amount of money (up to 1,99 ?)\n Please, specify the sum with accuracy to amount of coins.",
+  "ConfirmationLoop.Description": "To verify your card we charged and returned a small amount of money (up to 1,99 Р)\n Please, specify the exact sum including the coins",
   "ConfirmationLoop.Amount": "Blocked amount",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Please enter correct amount in coins",
   "ConfirmationLoop.CheckButton": "Check",
@@ -36,7 +36,7 @@
   "AddCard.Title": "Add card",
   "AddCard.Attachment.Title": "Attachment Title",
   "AddCard.Attachment.Description": "Attachment Descriptions",
-  "AddCard.AddCardButton": "Add card",
+  "AddCard.AddCardButton": "Add",
   "AddCard.Dialog.Error.Title": "Error",
   "AddCard.Dialog.Error.Network": "Probably the Internet connection is interrupted, try again later",
   "AddCard.Nfc.Fail": "Failed to scan a card",

From 86cbbcc8927ace86c35837514c667b9c5bd390bd Mon Sep 17 00:00:00 2001
From: Golovachev Ivan Sergeevich <i.s.golovachev@tinkoff.ru>
Date: Thu, 31 Jan 2019 13:27:35 +0300
Subject: [PATCH 13/13] ASDK-460
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

вернул символьное обозначение рубля
---
 sample/src/main/res/raw/custom.json          | 2 +-
 ui/src/main/res/raw/acq_localization_en.json | 2 +-
 ui/src/main/res/raw/acq_localization_ru.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sample/src/main/res/raw/custom.json b/sample/src/main/res/raw/custom.json
index 78df8eb..7171649 100644
--- a/sample/src/main/res/raw/custom.json
+++ b/sample/src/main/res/raw/custom.json
@@ -26,7 +26,7 @@
   "Pay.Nfc.Fail": "Не удалось распознать карту",
   "Pay.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "ConfirmationLoop.Title": "Оплата",
-  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ₽)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
   "ConfirmationLoop.CheckButton": "Проверить",
diff --git a/ui/src/main/res/raw/acq_localization_en.json b/ui/src/main/res/raw/acq_localization_en.json
index d8c9423..b0df368 100644
--- a/ui/src/main/res/raw/acq_localization_en.json
+++ b/ui/src/main/res/raw/acq_localization_en.json
@@ -28,7 +28,7 @@
   "Pay.Nfc.Fail": "Failed to scan a card",
   "Pay.NoScanProviders": "There aren't any providers",
   "ConfirmationLoop.Title": "Payment",
-  "ConfirmationLoop.Description": "To verify your card we charged and returned a small amount of money (up to 1,99 Р)\n Please, specify the exact sum including the coins",
+  "ConfirmationLoop.Description": "To verify your card we charged and returned a small amount of money (up to 1,99 ₽)\n Please, specify the exact sum including the coins",
   "ConfirmationLoop.Amount": "Blocked amount",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Please enter correct amount in coins",
   "ConfirmationLoop.CheckButton": "Check",
diff --git a/ui/src/main/res/raw/acq_localization_ru.json b/ui/src/main/res/raw/acq_localization_ru.json
index 685f766..e27b388 100644
--- a/ui/src/main/res/raw/acq_localization_ru.json
+++ b/ui/src/main/res/raw/acq_localization_ru.json
@@ -28,7 +28,7 @@
   "Pay.Nfc.Fail": "Не удалось распознать карту",
   "Pay.NoScanProviders": "Отсутствуют провайдеры для сканирования",
   "ConfirmationLoop.Title": "Оплата",
-  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ?)\nПожалуйста, укажите ее с точностью до копеек",
+  "ConfirmationLoop.Description": "Для подтверждения привязки карты мы списали и вернули небольшую сумму (до 1,99 ₽)\nПожалуйста, укажите ее с точностью до копеек",
   "ConfirmationLoop.Amount": "Заблокированная сумма",
   "ConfirmationLoop.Dialog.Validation.InvalidAmount": "Введите корректную сумму в копейках",
   "ConfirmationLoop.CheckButton": "Проверить",