@jimrising/easymerchantsdk-react-native 1.7.3 → 1.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/README.md +1 -1
  2. package/android/build/.transforms/eef2d06269ef2e204b4f065513034fca/transformed/classes/classes_dex/classes.dex +0 -0
  3. package/android/build/.transforms/ffabb40f9809b32eb9546ce76fc51764/transformed/bundleLibRuntimeToDirRelease/bundleLibRuntimeToDirRelease_dex/com/reactlibrary/RNEasymerchantsdkModule$1.dex +0 -0
  4. package/android/build/.transforms/ffabb40f9809b32eb9546ce76fc51764/transformed/bundleLibRuntimeToDirRelease/bundleLibRuntimeToDirRelease_dex/com/reactlibrary/RNEasymerchantsdkModule$2.dex +0 -0
  5. package/android/build/.transforms/ffabb40f9809b32eb9546ce76fc51764/transformed/bundleLibRuntimeToDirRelease/bundleLibRuntimeToDirRelease_dex/com/reactlibrary/RNEasymerchantsdkModule.dex +0 -0
  6. package/android/build/intermediates/aar_main_jar/release/syncReleaseLibJars/classes.jar +0 -0
  7. package/android/build/intermediates/compile_library_classes_jar/release/bundleLibCompileToJarRelease/classes.jar +0 -0
  8. package/android/build/intermediates/full_jar/release/createFullJarRelease/full.jar +0 -0
  9. package/android/build/intermediates/incremental/lintVitalAnalyzeRelease/release-artifact-dependencies.xml +4 -4
  10. package/android/build/intermediates/incremental/lintVitalAnalyzeRelease/release-artifact-libraries.xml +4 -4
  11. package/android/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties +859 -1690
  12. package/android/build/intermediates/incremental/release/mergeReleaseResources/merger.xml +3 -3
  13. package/android/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +1 -1
  14. package/android/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule$1.class +0 -0
  15. package/android/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule$2.class +0 -0
  16. package/android/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule.class +0 -0
  17. package/android/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/android/tools/build/group-index.xml +14 -14
  18. package/android/build/intermediates/lint_model/release/generateReleaseLintModel/release-artifact-dependencies.xml +4 -4
  19. package/android/build/intermediates/lint_model/release/generateReleaseLintModel/release-artifact-libraries.xml +4 -4
  20. package/android/build/intermediates/lint_vital_lint_model/release/generateReleaseLintVitalModel/release-artifact-dependencies.xml +4 -4
  21. package/android/build/intermediates/lint_vital_lint_model/release/generateReleaseLintVitalModel/release-artifact-libraries.xml +4 -4
  22. package/android/build/intermediates/local_aar_for_lint/release/out.aar +0 -0
  23. package/android/build/intermediates/merged_res/release/mergeReleaseResources/layout/activity_select_payment_method.xml +347 -315
  24. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/multi-v2/values-night-v8.json +22 -22
  25. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/multi-v2/values.json +38 -38
  26. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/animator.json +2 -2
  27. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-anydpi-v21.json +6 -6
  28. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-hdpi-v4.json +12 -12
  29. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-ldpi-v4.json +6 -6
  30. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-mdpi-v4.json +11 -11
  31. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-v21.json +1 -1
  32. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-v29.json +1 -1
  33. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-xhdpi-v4.json +11 -11
  34. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-xxhdpi-v4.json +6 -6
  35. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable-xxxhdpi-v4.json +6 -6
  36. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/drawable.json +319 -319
  37. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/font.json +9 -9
  38. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/layout-v21.json +4 -4
  39. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/layout.json +35 -35
  40. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-anydpi-v26.json +2 -2
  41. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-hdpi-v4.json +2 -2
  42. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-mdpi-v4.json +2 -2
  43. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-xhdpi-v4.json +2 -2
  44. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-xxhdpi-v4.json +2 -2
  45. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/mipmap-xxxhdpi-v4.json +2 -2
  46. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/raw.json +46 -46
  47. package/android/build/intermediates/merged_res_blame_folder/release/mergeReleaseResources/out/single/xml.json +2 -2
  48. package/android/build/intermediates/runtime_library_classes_dir/release/bundleLibRuntimeToDirRelease/com/reactlibrary/RNEasymerchantsdkModule$1.class +0 -0
  49. package/android/build/intermediates/runtime_library_classes_dir/release/bundleLibRuntimeToDirRelease/com/reactlibrary/RNEasymerchantsdkModule$2.class +0 -0
  50. package/android/build/intermediates/runtime_library_classes_dir/release/bundleLibRuntimeToDirRelease/com/reactlibrary/RNEasymerchantsdkModule.class +0 -0
  51. package/android/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar +0 -0
  52. package/android/build/intermediates/source_set_path_map/release/mapReleaseSourceSetPaths/file-map.txt +19 -19
  53. package/android/build/intermediates/verified_library_resources/release/verifyReleaseResources/compiled/layout_activity_select_payment_method.xml.flat +0 -0
  54. package/android/build/outputs/aar/jimrising_easymerchantsdk-react-native-release.aar +0 -0
  55. package/android/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin +0 -0
  56. package/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java +0 -1
  57. package/ios/Classes/EasyMerchantSdk.m +2 -2
  58. package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift +132 -135
  59. package/ios/Pods/ViewControllers/PaymentInformation/SavedAccountsTVC/SavedAccountTVC.xib +10 -10
  60. package/ios/Pods/ViewControllers/PaymentInformation/SavedCardsTVC/SavedCardsTVC.xib +18 -14
  61. package/ios/easymerchantsdk.podspec +1 -1
  62. package/ios/easymerchantsdk.storyboard +157 -123
  63. package/package.json +1 -1
package/android/build/intermediates/merged_res/release/mergeReleaseResources/layout/activity_select_payment_method.xml CHANGED
@@ -201,14 +201,13 @@
201
201
  </LinearLayout>
202
202
 
203
203
 
204
-
205
204
  <androidx.recyclerview.widget.RecyclerView
206
205
  android:id="@+id/rv_grailPayBanks"
207
206
  android:layout_width="match_parent"
208
207
  android:layout_height="wrap_content"
208
+ android:layout_marginHorizontal="20dp"
209
209
  android:layout_marginTop="10dp"
210
210
  android:visibility="gone"
211
- android:layout_marginHorizontal="20dp"
212
211
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
213
212
  tools:itemCount="2"
214
213
  tools:listitem="@layout/item_bank_new" />
@@ -514,6 +513,19 @@
514
513
  android:textSize="16sp" />
515
514
  </LinearLayout>
516
515
 
516
+ <Button
517
+ android:id="@+id/btn_getEmailOtp"
518
+ android:layout_width="match_parent"
519
+ android:layout_height="wrap_content"
520
+ android:layout_marginTop="20dp"
521
+ android:layout_marginBottom="15dp"
522
+ android:background="@drawable/bg_rad_8"
523
+ android:fontFamily="@font/inter_regular"
524
+ android:text="@string/get_otp"
525
+ android:textAllCaps="false"
526
+ android:textSize="16sp"
527
+ android:visibility="gone" />
528
+
517
529
  </LinearLayout>
518
530
 
519
531
  <LinearLayout
@@ -1502,8 +1514,8 @@
1502
1514
  android:id="@+id/ll_choosePlanNew"
1503
1515
  android:layout_width="match_parent"
1504
1516
  android:layout_height="wrap_content"
1505
- android:layout_marginTop="20dp"
1506
1517
  android:layout_marginHorizontal="15dp"
1518
+ android:layout_marginTop="20dp"
1507
1519
  android:orientation="vertical">
1508
1520
 
1509
1521
  <LinearLayout
@@ -1642,8 +1654,8 @@
1642
1654
  android:layout_height="wrap_content"
1643
1655
  android:checked="false"
1644
1656
  android:gravity="center" />
1645
- <!-- android:background="@drawable/round_checkbox_background"-->
1646
- <!-- android:buttonTint="@android:color/transparent"-->
1657
+ <!-- android:background="@drawable/round_checkbox_background"-->
1658
+ <!-- android:buttonTint="@android:color/transparent"-->
1647
1659
 
1648
1660
  <TextView
1649
1661
  android:id="@+id/tv_saveCardSecurely"
@@ -2011,79 +2023,26 @@
2011
2023
  android:textSize="14sp" />
2012
2024
 
2013
2025
  <LinearLayout
2026
+ android:id="@+id/ll_newBankAddParams"
2014
2027
  android:layout_width="match_parent"
2015
2028
  android:layout_height="wrap_content"
2016
- android:layout_marginHorizontal="15dp"
2017
- android:layout_marginTop="20dp"
2018
- android:gravity="center_vertical"
2019
- android:orientation="horizontal"
2020
- android:weightSum="1">
2021
-
2022
- <TextView
2023
- android:id="@+id/tv_headingbankAcountName"
2024
- style="@style/SimpleTextStyle"
2025
- android:layout_width="wrap_content"
2026
- android:layout_height="wrap_content"
2027
- android:text="@string/bank_account_name"
2028
- android:textFontWeight="600" />
2029
-
2030
- <TextView
2031
- style="@style/SimpleTextStyle"
2032
- android:layout_width="0dp"
2033
- android:layout_height="wrap_content"
2034
- android:layout_marginStart="5dp"
2035
- android:layout_weight="1"
2036
- android:text="@string/compulsary"
2037
- android:textColor="@color/red"
2038
- android:textFontWeight="600" />
2039
- </LinearLayout>
2040
-
2041
- <LinearLayout
2042
- android:id="@+id/ll_bankAccountNameNew"
2043
- android:layout_width="match_parent"
2044
- android:layout_height="50dp"
2045
- android:layout_marginHorizontal="15dp"
2046
- android:layout_marginTop="10dp"
2047
- android:background="@drawable/et_bg"
2048
- android:gravity="center_vertical"
2049
- android:orientation="horizontal"
2050
- android:paddingHorizontal="20dp"
2051
- android:weightSum="1">
2052
-
2053
-
2054
- <EditText
2055
- android:id="@+id/et_bankAccountNameNew"
2056
- android:layout_width="0dp"
2057
- android:layout_height="match_parent"
2058
- android:layout_weight="1"
2059
- android:background="@null"
2060
- android:hint="@string/bank_account_name"
2061
- android:imeOptions="actionNext"
2062
- android:maxLength="16"
2063
- android:singleLine="true"
2064
- android:textSize="16sp" />
2065
- </LinearLayout>
2066
-
2067
- <LinearLayout
2068
- android:layout_width="match_parent"
2069
- android:layout_height="wrap_content"
2070
- android:layout_marginHorizontal="15dp"
2071
- android:layout_marginTop="20dp"
2072
2029
  android:orientation="vertical">
2073
2030
 
2074
2031
  <LinearLayout
2075
2032
  android:layout_width="match_parent"
2076
2033
  android:layout_height="wrap_content"
2034
+ android:layout_marginHorizontal="15dp"
2035
+ android:layout_marginTop="20dp"
2077
2036
  android:gravity="center_vertical"
2078
2037
  android:orientation="horizontal"
2079
2038
  android:weightSum="1">
2080
2039
 
2081
2040
  <TextView
2082
- android:id="@+id/tv_headingRoutingNumber"
2041
+ android:id="@+id/tv_headingbankAcountName"
2083
2042
  style="@style/SimpleTextStyle"
2084
2043
  android:layout_width="wrap_content"
2085
2044
  android:layout_height="wrap_content"
2086
- android:text="@string/routing_number"
2045
+ android:text="@string/bank_account_name"
2087
2046
  android:textFontWeight="600" />
2088
2047
 
2089
2048
  <TextView
@@ -2098,9 +2057,10 @@
2098
2057
  </LinearLayout>
2099
2058
 
2100
2059
  <LinearLayout
2101
- android:id="@+id/ll_routingNumberNew"
2060
+ android:id="@+id/ll_bankAccountNameNew"
2102
2061
  android:layout_width="match_parent"
2103
2062
  android:layout_height="50dp"
2063
+ android:layout_marginHorizontal="15dp"
2104
2064
  android:layout_marginTop="10dp"
2105
2065
  android:background="@drawable/et_bg"
2106
2066
  android:gravity="center_vertical"
@@ -2108,257 +2068,255 @@
2108
2068
  android:paddingHorizontal="20dp"
2109
2069
  android:weightSum="1">
2110
2070
 
2071
+
2111
2072
  <EditText
2112
- android:id="@+id/et_routingNumberNew"
2073
+ android:id="@+id/et_bankAccountNameNew"
2113
2074
  android:layout_width="0dp"
2114
2075
  android:layout_height="match_parent"
2115
2076
  android:layout_weight="1"
2116
2077
  android:background="@null"
2117
- android:hint="@string/routing_number"
2078
+ android:hint="@string/bank_account_name"
2118
2079
  android:imeOptions="actionNext"
2119
- android:maxLength="9"
2080
+ android:maxLength="16"
2120
2081
  android:singleLine="true"
2121
- android:inputType="number"
2122
2082
  android:textSize="16sp" />
2123
2083
  </LinearLayout>
2124
- </LinearLayout>
2125
-
2126
- <LinearLayout
2127
- android:layout_width="match_parent"
2128
- android:layout_height="wrap_content"
2129
- android:layout_marginHorizontal="15dp"
2130
- android:layout_marginTop="20dp"
2131
- android:orientation="vertical">
2132
2084
 
2133
2085
  <LinearLayout
2134
2086
  android:layout_width="match_parent"
2135
2087
  android:layout_height="wrap_content"
2136
- android:gravity="center_vertical"
2137
- android:orientation="horizontal"
2138
- android:weightSum="1">
2088
+ android:layout_marginHorizontal="15dp"
2089
+ android:layout_marginTop="20dp"
2090
+ android:orientation="vertical">
2139
2091
 
2140
- <TextView
2141
- android:id="@+id/tv_headingAccountType"
2142
- style="@style/SimpleTextStyle"
2143
- android:layout_width="wrap_content"
2092
+ <LinearLayout
2093
+ android:layout_width="match_parent"
2144
2094
  android:layout_height="wrap_content"
2145
- android:text="@string/account_type"
2146
- android:textFontWeight="600" />
2095
+ android:gravity="center_vertical"
2096
+ android:orientation="horizontal"
2097
+ android:weightSum="1">
2147
2098
 
2148
- <TextView
2149
- style="@style/SimpleTextStyle"
2150
- android:layout_width="0dp"
2151
- android:layout_height="wrap_content"
2152
- android:layout_marginStart="5dp"
2153
- android:layout_weight="1"
2154
- android:text="@string/compulsary"
2155
- android:textColor="@color/red"
2156
- android:textFontWeight="600" />
2157
- </LinearLayout>
2099
+ <TextView
2100
+ android:id="@+id/tv_headingRoutingNumber"
2101
+ style="@style/SimpleTextStyle"
2102
+ android:layout_width="wrap_content"
2103
+ android:layout_height="wrap_content"
2104
+ android:text="@string/routing_number"
2105
+ android:textFontWeight="600" />
2158
2106
 
2159
- <RelativeLayout
2160
- android:id="@+id/rl_accountTypeNew"
2161
- android:layout_width="match_parent"
2162
- android:layout_height="50dp"
2163
- android:layout_marginTop="10dp"
2164
- android:background="@drawable/et_bg"
2165
- android:gravity="center_vertical"
2166
- android:orientation="horizontal"
2167
- android:paddingHorizontal="10dp"
2168
- android:weightSum="1">
2107
+ <TextView
2108
+ style="@style/SimpleTextStyle"
2109
+ android:layout_width="0dp"
2110
+ android:layout_height="wrap_content"
2111
+ android:layout_marginStart="5dp"
2112
+ android:layout_weight="1"
2113
+ android:text="@string/compulsary"
2114
+ android:textColor="@color/red"
2115
+ android:textFontWeight="600" />
2116
+ </LinearLayout>
2169
2117
 
2170
- <Spinner
2171
- android:id="@+id/spinner_accountTypeNew"
2118
+ <LinearLayout
2119
+ android:id="@+id/ll_routingNumberNew"
2172
2120
  android:layout_width="match_parent"
2173
- android:layout_height="match_parent"
2174
- android:layout_marginVertical="2dp"
2175
- android:background="@android:color/transparent" />
2176
- </RelativeLayout>
2177
- </LinearLayout>
2121
+ android:layout_height="50dp"
2122
+ android:layout_marginTop="10dp"
2123
+ android:background="@drawable/et_bg"
2124
+ android:gravity="center_vertical"
2125
+ android:orientation="horizontal"
2126
+ android:paddingHorizontal="20dp"
2127
+ android:weightSum="1">
2178
2128
 
2179
- <LinearLayout
2180
- android:layout_width="match_parent"
2181
- android:layout_height="wrap_content"
2182
- android:layout_marginHorizontal="15dp"
2183
- android:layout_marginTop="20dp"
2184
- android:orientation="vertical">
2129
+ <EditText
2130
+ android:id="@+id/et_routingNumberNew"
2131
+ android:layout_width="0dp"
2132
+ android:layout_height="match_parent"
2133
+ android:layout_weight="1"
2134
+ android:background="@null"
2135
+ android:hint="@string/routing_number"
2136
+ android:imeOptions="actionNext"
2137
+ android:inputType="number"
2138
+ android:maxLength="9"
2139
+ android:singleLine="true"
2140
+ android:textSize="16sp" />
2141
+ </LinearLayout>
2142
+ </LinearLayout>
2185
2143
 
2186
2144
  <LinearLayout
2187
2145
  android:layout_width="match_parent"
2188
2146
  android:layout_height="wrap_content"
2189
- android:gravity="center_vertical"
2190
- android:orientation="horizontal"
2191
- android:weightSum="1">
2147
+ android:layout_marginHorizontal="15dp"
2148
+ android:layout_marginTop="20dp"
2149
+ android:orientation="vertical">
2192
2150
 
2193
- <TextView
2194
- android:id="@+id/tv_headingAccountNumber"
2195
- style="@style/SimpleTextStyle"
2196
- android:layout_width="wrap_content"
2151
+ <LinearLayout
2152
+ android:layout_width="match_parent"
2197
2153
  android:layout_height="wrap_content"
2198
- android:text="@string/account_number"
2199
- android:textFontWeight="600" />
2154
+ android:gravity="center_vertical"
2155
+ android:orientation="horizontal"
2156
+ android:weightSum="1">
2200
2157
 
2201
- <TextView
2202
- style="@style/SimpleTextStyle"
2203
- android:layout_width="0dp"
2204
- android:layout_height="wrap_content"
2205
- android:layout_marginStart="5dp"
2206
- android:layout_weight="1"
2207
- android:text="@string/compulsary"
2208
- android:textColor="@color/red"
2209
- android:textFontWeight="600" />
2210
- </LinearLayout>
2158
+ <TextView
2159
+ android:id="@+id/tv_headingAccountType"
2160
+ style="@style/SimpleTextStyle"
2161
+ android:layout_width="wrap_content"
2162
+ android:layout_height="wrap_content"
2163
+ android:text="@string/account_type"
2164
+ android:textFontWeight="600" />
2211
2165
 
2212
- <LinearLayout
2213
- android:id="@+id/ll_accountNumberNew"
2214
- android:layout_width="match_parent"
2215
- android:layout_height="50dp"
2216
- android:layout_marginTop="10dp"
2217
- android:background="@drawable/et_bg"
2218
- android:gravity="center_vertical"
2219
- android:orientation="horizontal"
2220
- android:paddingHorizontal="20dp"
2221
- android:weightSum="1">
2166
+ <TextView
2167
+ style="@style/SimpleTextStyle"
2168
+ android:layout_width="0dp"
2169
+ android:layout_height="wrap_content"
2170
+ android:layout_marginStart="5dp"
2171
+ android:layout_weight="1"
2172
+ android:text="@string/compulsary"
2173
+ android:textColor="@color/red"
2174
+ android:textFontWeight="600" />
2175
+ </LinearLayout>
2222
2176
 
2223
- <EditText
2224
- android:id="@+id/et_accountNumberNew"
2225
- android:layout_width="0dp"
2226
- android:layout_height="match_parent"
2227
- android:layout_weight="1"
2228
- android:background="@null"
2229
- android:hint="@string/account_number"
2230
- android:imeOptions="actionDone"
2231
- android:maxLength="16"
2232
- android:singleLine="true"
2233
- android:inputType="number"
2234
- android:textSize="16sp" />
2235
- </LinearLayout>
2236
- </LinearLayout>
2177
+ <RelativeLayout
2178
+ android:id="@+id/rl_accountTypeNew"
2179
+ android:layout_width="match_parent"
2180
+ android:layout_height="50dp"
2181
+ android:layout_marginTop="10dp"
2182
+ android:background="@drawable/et_bg"
2183
+ android:gravity="center_vertical"
2184
+ android:orientation="horizontal"
2185
+ android:paddingHorizontal="10dp"
2186
+ android:weightSum="1">
2237
2187
 
2238
- <LinearLayout
2239
- android:layout_width="match_parent"
2240
- android:layout_height="wrap_content"
2241
- android:layout_marginHorizontal="15dp"
2242
- android:layout_marginTop="20dp"
2243
- android:orientation="vertical">
2188
+ <Spinner
2189
+ android:id="@+id/spinner_accountTypeNew"
2190
+ android:layout_width="match_parent"
2191
+ android:layout_height="match_parent"
2192
+ android:layout_marginVertical="2dp"
2193
+ android:background="@android:color/transparent" />
2194
+ </RelativeLayout>
2195
+ </LinearLayout>
2244
2196
 
2245
2197
  <LinearLayout
2246
2198
  android:layout_width="match_parent"
2247
2199
  android:layout_height="wrap_content"
2248
- android:gravity="center_vertical"
2249
- android:orientation="horizontal"
2250
- android:weightSum="1">
2200
+ android:layout_marginHorizontal="15dp"
2201
+ android:layout_marginTop="20dp"
2202
+ android:orientation="vertical">
2251
2203
 
2252
- <TextView
2253
- android:id="@+id/tv_headingAccountNumberConfirm"
2254
- style="@style/SimpleTextStyle"
2255
- android:layout_width="wrap_content"
2204
+ <LinearLayout
2205
+ android:layout_width="match_parent"
2256
2206
  android:layout_height="wrap_content"
2257
- android:text="@string/confirm_account_number"
2258
- android:textFontWeight="600" />
2207
+ android:gravity="center_vertical"
2208
+ android:orientation="horizontal"
2209
+ android:weightSum="1">
2259
2210
 
2260
- <TextView
2261
- style="@style/SimpleTextStyle"
2262
- android:layout_width="0dp"
2263
- android:layout_height="wrap_content"
2264
- android:layout_marginStart="5dp"
2265
- android:layout_weight="1"
2266
- android:text="@string/compulsary"
2267
- android:textColor="@color/red"
2268
- android:textFontWeight="600" />
2269
- </LinearLayout>
2211
+ <TextView
2212
+ android:id="@+id/tv_headingAccountNumber"
2213
+ style="@style/SimpleTextStyle"
2214
+ android:layout_width="wrap_content"
2215
+ android:layout_height="wrap_content"
2216
+ android:text="@string/account_number"
2217
+ android:textFontWeight="600" />
2270
2218
 
2271
- <LinearLayout
2272
- android:id="@+id/ll_accountNumberConfirmNew"
2273
- android:layout_width="match_parent"
2274
- android:layout_height="50dp"
2275
- android:layout_marginTop="10dp"
2276
- android:background="@drawable/et_bg"
2277
- android:gravity="center_vertical"
2278
- android:orientation="horizontal"
2279
- android:paddingHorizontal="20dp"
2280
- android:weightSum="1">
2219
+ <TextView
2220
+ style="@style/SimpleTextStyle"
2221
+ android:layout_width="0dp"
2222
+ android:layout_height="wrap_content"
2223
+ android:layout_marginStart="5dp"
2224
+ android:layout_weight="1"
2225
+ android:text="@string/compulsary"
2226
+ android:textColor="@color/red"
2227
+ android:textFontWeight="600" />
2228
+ </LinearLayout>
2281
2229
 
2282
- <EditText
2283
- android:id="@+id/et_accountNumberConfirmNew"
2284
- android:layout_width="0dp"
2285
- android:layout_height="match_parent"
2286
- android:layout_weight="1"
2287
- android:background="@null"
2288
- android:hint="@string/confirm_account_number"
2289
- android:imeOptions="actionDone"
2290
- android:maxLength="16"
2291
- android:singleLine="true"
2292
- android:inputType="number"
2293
- android:textSize="16sp" />
2294
- </LinearLayout>
2295
- </LinearLayout>
2230
+ <LinearLayout
2231
+ android:id="@+id/ll_accountNumberNew"
2232
+ android:layout_width="match_parent"
2233
+ android:layout_height="50dp"
2234
+ android:layout_marginTop="10dp"
2235
+ android:background="@drawable/et_bg"
2236
+ android:gravity="center_vertical"
2237
+ android:orientation="horizontal"
2238
+ android:paddingHorizontal="20dp"
2239
+ android:weightSum="1">
2296
2240
 
2297
- <LinearLayout
2298
- android:id="@+id/ll_choosePlanNewBank"
2299
- android:layout_width="match_parent"
2300
- android:layout_height="wrap_content"
2301
- android:layout_marginTop="20dp"
2302
- android:layout_marginHorizontal="15dp"
2303
- android:orientation="vertical">
2241
+ <EditText
2242
+ android:id="@+id/et_accountNumberNew"
2243
+ android:layout_width="0dp"
2244
+ android:layout_height="match_parent"
2245
+ android:layout_weight="1"
2246
+ android:background="@null"
2247
+ android:hint="@string/account_number"
2248
+ android:imeOptions="actionDone"
2249
+ android:inputType="number"
2250
+ android:maxLength="16"
2251
+ android:singleLine="true"
2252
+ android:textSize="16sp" />
2253
+ </LinearLayout>
2254
+ </LinearLayout>
2304
2255
 
2305
2256
  <LinearLayout
2306
2257
  android:layout_width="match_parent"
2307
2258
  android:layout_height="wrap_content"
2308
- android:gravity="center_vertical"
2309
- android:orientation="horizontal"
2310
- android:weightSum="1">
2259
+ android:layout_marginHorizontal="15dp"
2260
+ android:layout_marginTop="20dp"
2261
+ android:orientation="vertical">
2311
2262
 
2312
- <TextView
2313
- android:id="@+id/tv_chooseYourPlanNewBank"
2314
- style="@style/SimpleTextStyle"
2315
- android:layout_width="wrap_content"
2263
+ <LinearLayout
2264
+ android:layout_width="match_parent"
2316
2265
  android:layout_height="wrap_content"
2317
- android:text="@string/choose_your_plan"
2318
- android:textFontWeight="600" />
2266
+ android:gravity="center_vertical"
2267
+ android:orientation="horizontal"
2268
+ android:weightSum="1">
2319
2269
 
2320
- <TextView
2321
- style="@style/SimpleTextStyle"
2322
- android:layout_width="0dp"
2323
- android:layout_height="wrap_content"
2324
- android:layout_marginStart="5dp"
2325
- android:layout_weight="1"
2326
- android:text="@string/compulsary"
2327
- android:textColor="@color/red"
2328
- android:textFontWeight="600" />
2329
- </LinearLayout>
2270
+ <TextView
2271
+ android:id="@+id/tv_headingAccountNumberConfirm"
2272
+ style="@style/SimpleTextStyle"
2273
+ android:layout_width="wrap_content"
2274
+ android:layout_height="wrap_content"
2275
+ android:text="@string/confirm_account_number"
2276
+ android:textFontWeight="600" />
2330
2277
 
2331
- <RelativeLayout
2332
- android:id="@+id/rl_chooseYourPlanNewBank"
2333
- android:layout_width="match_parent"
2334
- android:layout_height="50dp"
2335
- android:layout_marginTop="10dp"
2336
- android:background="@drawable/et_bg"
2337
- android:gravity="center_vertical"
2338
- android:orientation="horizontal"
2339
- android:paddingHorizontal="10dp"
2340
- android:weightSum="1">
2278
+ <TextView
2279
+ style="@style/SimpleTextStyle"
2280
+ android:layout_width="0dp"
2281
+ android:layout_height="wrap_content"
2282
+ android:layout_marginStart="5dp"
2283
+ android:layout_weight="1"
2284
+ android:text="@string/compulsary"
2285
+ android:textColor="@color/red"
2286
+ android:textFontWeight="600" />
2287
+ </LinearLayout>
2341
2288
 
2342
- <Spinner
2343
- android:id="@+id/spinner_chooseYourPlanNewBank"
2289
+ <LinearLayout
2290
+ android:id="@+id/ll_accountNumberConfirmNew"
2344
2291
  android:layout_width="match_parent"
2345
- android:layout_height="match_parent"
2346
- android:layout_marginVertical="2dp"
2347
- android:background="@android:color/transparent" />
2292
+ android:layout_height="50dp"
2293
+ android:layout_marginTop="10dp"
2294
+ android:background="@drawable/et_bg"
2295
+ android:gravity="center_vertical"
2296
+ android:orientation="horizontal"
2297
+ android:paddingHorizontal="20dp"
2298
+ android:weightSum="1">
2348
2299
 
2349
- <ImageView
2350
- android:id="@+id/iv_planDropArrowNewBank"
2351
- android:layout_width="15dp"
2352
- android:layout_height="15dp"
2353
- android:layout_alignParentEnd="true"
2354
- android:layout_centerVertical="true"
2355
- android:src="@drawable/arrow_down" />
2356
- </RelativeLayout>
2300
+ <EditText
2301
+ android:id="@+id/et_accountNumberConfirmNew"
2302
+ android:layout_width="0dp"
2303
+ android:layout_height="match_parent"
2304
+ android:layout_weight="1"
2305
+ android:background="@null"
2306
+ android:hint="@string/confirm_account_number"
2307
+ android:imeOptions="actionDone"
2308
+ android:inputType="number"
2309
+ android:maxLength="16"
2310
+ android:singleLine="true"
2311
+ android:textSize="16sp" />
2312
+ </LinearLayout>
2313
+ </LinearLayout>
2357
2314
 
2358
2315
  <LinearLayout
2359
- android:id="@+id/ll_recurringDateNewBank"
2316
+ android:id="@+id/ll_choosePlanNewBank"
2360
2317
  android:layout_width="match_parent"
2361
2318
  android:layout_height="wrap_content"
2319
+ android:layout_marginHorizontal="15dp"
2362
2320
  android:layout_marginTop="20dp"
2363
2321
  android:orientation="vertical">
2364
2322
 
@@ -2370,11 +2328,11 @@
2370
2328
  android:weightSum="1">
2371
2329
 
2372
2330
  <TextView
2373
- android:id="@+id/tv_recurringStartDateNewBank"
2331
+ android:id="@+id/tv_chooseYourPlanNewBank"
2374
2332
  style="@style/SimpleTextStyle"
2375
2333
  android:layout_width="wrap_content"
2376
2334
  android:layout_height="wrap_content"
2377
- android:text="@string/start_date"
2335
+ android:text="@string/choose_your_plan"
2378
2336
  android:textFontWeight="600" />
2379
2337
 
2380
2338
  <TextView
@@ -2389,7 +2347,7 @@
2389
2347
  </LinearLayout>
2390
2348
 
2391
2349
  <RelativeLayout
2392
- android:id="@+id/rl_startDateNewBank"
2350
+ android:id="@+id/rl_chooseYourPlanNewBank"
2393
2351
  android:layout_width="match_parent"
2394
2352
  android:layout_height="50dp"
2395
2353
  android:layout_marginTop="10dp"
@@ -2399,62 +2357,138 @@
2399
2357
  android:paddingHorizontal="10dp"
2400
2358
  android:weightSum="1">
2401
2359
 
2402
- <TextView
2403
- android:id="@+id/tv_recurringDateNewBank"
2360
+ <Spinner
2361
+ android:id="@+id/spinner_chooseYourPlanNewBank"
2404
2362
  android:layout_width="match_parent"
2405
2363
  android:layout_height="match_parent"
2406
- android:background="@null"
2407
- android:gravity="center_vertical"
2408
- android:hint="@string/dd_mm_yyyy"
2409
- android:maxLength="16"
2410
- android:paddingStart="5dp"
2411
- android:singleLine="true"
2412
- android:textSize="16sp" />
2364
+ android:layout_marginVertical="2dp"
2365
+ android:background="@android:color/transparent" />
2413
2366
 
2414
2367
  <ImageView
2415
- android:id="@+id/iv_pickRecurringDateNewBank"
2368
+ android:id="@+id/iv_planDropArrowNewBank"
2416
2369
  android:layout_width="15dp"
2417
2370
  android:layout_height="15dp"
2418
2371
  android:layout_alignParentEnd="true"
2419
2372
  android:layout_centerVertical="true"
2420
- android:src="@drawable/calender_icon" />
2373
+ android:src="@drawable/arrow_down" />
2421
2374
  </RelativeLayout>
2422
- </LinearLayout>
2423
- </LinearLayout>
2424
2375
 
2425
- <LinearLayout
2426
- android:id="@+id/ll_bankCheckboxNew"
2427
- android:layout_width="match_parent"
2428
- android:layout_height="wrap_content"
2429
- android:layout_marginHorizontal="10dp"
2430
- android:layout_marginVertical="20dp"
2431
- android:gravity="center_vertical"
2432
- android:orientation="horizontal"
2433
- android:weightSum="1">
2376
+ <LinearLayout
2377
+ android:id="@+id/ll_recurringDateNewBank"
2378
+ android:layout_width="match_parent"
2379
+ android:layout_height="wrap_content"
2380
+ android:layout_marginTop="20dp"
2381
+ android:orientation="vertical">
2434
2382
 
2435
- <CheckBox
2436
- android:id="@+id/cb_bankCheckboxNew"
2437
- android:layout_width="wrap_content"
2383
+ <LinearLayout
2384
+ android:layout_width="match_parent"
2385
+ android:layout_height="wrap_content"
2386
+ android:gravity="center_vertical"
2387
+ android:orientation="horizontal"
2388
+ android:weightSum="1">
2389
+
2390
+ <TextView
2391
+ android:id="@+id/tv_recurringStartDateNewBank"
2392
+ style="@style/SimpleTextStyle"
2393
+ android:layout_width="wrap_content"
2394
+ android:layout_height="wrap_content"
2395
+ android:text="@string/start_date"
2396
+ android:textFontWeight="600" />
2397
+
2398
+ <TextView
2399
+ style="@style/SimpleTextStyle"
2400
+ android:layout_width="0dp"
2401
+ android:layout_height="wrap_content"
2402
+ android:layout_marginStart="5dp"
2403
+ android:layout_weight="1"
2404
+ android:text="@string/compulsary"
2405
+ android:textColor="@color/red"
2406
+ android:textFontWeight="600" />
2407
+ </LinearLayout>
2408
+
2409
+ <RelativeLayout
2410
+ android:id="@+id/rl_startDateNewBank"
2411
+ android:layout_width="match_parent"
2412
+ android:layout_height="50dp"
2413
+ android:layout_marginTop="10dp"
2414
+ android:background="@drawable/et_bg"
2415
+ android:gravity="center_vertical"
2416
+ android:orientation="horizontal"
2417
+ android:paddingHorizontal="10dp"
2418
+ android:weightSum="1">
2419
+
2420
+ <TextView
2421
+ android:id="@+id/tv_recurringDateNewBank"
2422
+ android:layout_width="match_parent"
2423
+ android:layout_height="match_parent"
2424
+ android:background="@null"
2425
+ android:gravity="center_vertical"
2426
+ android:hint="@string/dd_mm_yyyy"
2427
+ android:maxLength="16"
2428
+ android:paddingStart="5dp"
2429
+ android:singleLine="true"
2430
+ android:textSize="16sp" />
2431
+
2432
+ <ImageView
2433
+ android:id="@+id/iv_pickRecurringDateNewBank"
2434
+ android:layout_width="15dp"
2435
+ android:layout_height="15dp"
2436
+ android:layout_alignParentEnd="true"
2437
+ android:layout_centerVertical="true"
2438
+ android:src="@drawable/calender_icon" />
2439
+ </RelativeLayout>
2440
+ </LinearLayout>
2441
+ </LinearLayout>
2442
+
2443
+ <LinearLayout
2444
+ android:id="@+id/ll_bankCheckboxNew"
2445
+ android:layout_width="match_parent"
2438
2446
  android:layout_height="wrap_content"
2447
+ android:layout_marginHorizontal="10dp"
2448
+ android:layout_marginVertical="20dp"
2449
+ android:gravity="center_vertical"
2450
+ android:orientation="horizontal"
2451
+ android:weightSum="1">
2439
2452
 
2440
- android:gravity="center" />
2441
- <!-- android:background="@drawable/round_checkbox_background"-->
2442
- <!-- android:buttonTint="@android:color/transparent"-->
2453
+ <CheckBox
2454
+ android:id="@+id/cb_bankCheckboxNew"
2455
+ android:layout_width="wrap_content"
2456
+ android:layout_height="wrap_content"
2443
2457
 
2444
- <TextView
2445
- android:id="@+id/tv_saveAccountText"
2446
- style="@style/SimpleTextStyle"
2447
- android:layout_width="0dp"
2458
+ android:gravity="center" />
2459
+ <!-- android:background="@drawable/round_checkbox_background"-->
2460
+ <!-- android:buttonTint="@android:color/transparent"-->
2461
+
2462
+ <TextView
2463
+ android:id="@+id/tv_saveAccountText"
2464
+ style="@style/SimpleTextStyle"
2465
+ android:layout_width="0dp"
2466
+ android:layout_height="wrap_content"
2467
+ android:layout_marginStart="5dp"
2468
+ android:layout_weight="1"
2469
+ android:text="@string/save_account_securely_for_future_payments"
2470
+ android:textAllCaps="true"
2471
+ android:textSize="12sp" />
2472
+ </LinearLayout>
2473
+
2474
+ <Button
2475
+ android:id="@+id/btn_addBankPaymentNew"
2476
+ android:layout_width="match_parent"
2448
2477
  android:layout_height="wrap_content"
2449
- android:layout_marginStart="5dp"
2450
- android:layout_weight="1"
2451
- android:text="@string/save_account_securely_for_future_payments"
2452
- android:textAllCaps="true"
2453
- android:textSize="12sp" />
2478
+ android:layout_marginHorizontal="15dp"
2479
+ android:layout_marginTop="10dp"
2480
+ android:layout_marginBottom="15dp"
2481
+ android:background="@drawable/bg_rad_8"
2482
+ android:fontFamily="@font/inter_regular"
2483
+ android:text="@string/next_billing_info"
2484
+ android:textAllCaps="false"
2485
+ android:textSize="16sp"
2486
+ android:visibility="visible" />
2487
+
2454
2488
  </LinearLayout>
2455
2489
 
2456
2490
  <Button
2457
- android:id="@+id/btn_addBankPaymentNew"
2491
+ android:id="@+id/btn_grailPayNew"
2458
2492
  android:layout_width="match_parent"
2459
2493
  android:layout_height="wrap_content"
2460
2494
  android:layout_marginHorizontal="15dp"
@@ -2462,10 +2496,10 @@
2462
2496
  android:layout_marginBottom="15dp"
2463
2497
  android:background="@drawable/bg_rad_8"
2464
2498
  android:fontFamily="@font/inter_regular"
2465
- android:text="@string/next_billing_info"
2499
+ android:text="@string/link_your_bank_account"
2466
2500
  android:textAllCaps="false"
2467
2501
  android:textSize="16sp"
2468
- android:visibility="visible" />
2502
+ android:visibility="gone" />
2469
2503
 
2470
2504
  </LinearLayout>
2471
2505
 
@@ -3425,8 +3459,8 @@
3425
3459
  android:layout_width="wrap_content"
3426
3460
  android:layout_height="wrap_content"
3427
3461
  android:gravity="center" />
3428
- <!-- android:background="@drawable/round_checkbox_background"-->
3429
- <!-- android:buttonTint="@android:color/transparent"-->
3462
+ <!-- android:background="@drawable/round_checkbox_background"-->
3463
+ <!-- android:buttonTint="@android:color/transparent"-->
3430
3464
  <!-- android:buttonTint="@{primaryButtonColor}"-->
3431
3465
 
3432
3466
 
@@ -3569,9 +3603,9 @@
3569
3603
  android:background="@null"
3570
3604
  android:hint="@string/routing_number"
3571
3605
  android:imeOptions="actionNext"
3606
+ android:inputType="number"
3572
3607
  android:maxLength="9"
3573
3608
  android:singleLine="true"
3574
- android:inputType="number"
3575
3609
  android:textSize="16sp" />
3576
3610
  </LinearLayout>
3577
3611
  </LinearLayout>
@@ -3680,8 +3714,8 @@
3680
3714
  android:layout_weight="1"
3681
3715
  android:background="@null"
3682
3716
  android:hint="@string/account_number"
3683
- android:maxLength="16"
3684
3717
  android:inputType="number"
3718
+ android:maxLength="16"
3685
3719
  android:singleLine="true"
3686
3720
  android:textSize="16sp" />
3687
3721
  </LinearLayout>
@@ -3739,9 +3773,9 @@
3739
3773
  android:layout_weight="1"
3740
3774
  android:background="@null"
3741
3775
  android:hint="@string/confirm_account_number"
3776
+ android:inputType="number"
3742
3777
  android:maxLength="16"
3743
3778
  android:singleLine="true"
3744
- android:inputType="number"
3745
3779
  android:textSize="16sp" />
3746
3780
  </LinearLayout>
3747
3781
 
@@ -3933,7 +3967,6 @@
3933
3967
  </LinearLayout>
3934
3968
 
3935
3969
 
3936
-
3937
3970
  </LinearLayout>
3938
3971
 
3939
3972
  <LinearLayout
@@ -4191,8 +4224,8 @@
4191
4224
  android:layout_marginVertical="20dp"
4192
4225
  android:gravity="center_vertical"
4193
4226
  android:orientation="horizontal"
4194
- android:weightSum="1"
4195
- android:visibility="gone">
4227
+ android:visibility="gone"
4228
+ android:weightSum="1">
4196
4229
 
4197
4230
  <CheckBox
4198
4231
  android:id="@+id/cb_bankCheckbox"
@@ -4200,8 +4233,8 @@
4200
4233
  android:layout_height="wrap_content"
4201
4234
 
4202
4235
  android:gravity="center" />
4203
- <!-- android:background="@drawable/round_checkbox_background"-->
4204
- <!-- android:buttonTint="@android:color/transparent"-->
4236
+ <!-- android:background="@drawable/round_checkbox_background"-->
4237
+ <!-- android:buttonTint="@android:color/transparent"-->
4205
4238
 
4206
4239
  <TextView
4207
4240
  android:id="@+id/tv_saveAccountTextTwo"
@@ -4262,8 +4295,7 @@
4262
4295
  android:background="@drawable/btn_hover_bg"
4263
4296
  android:gravity="center"
4264
4297
  android:orientation="vertical"
4265
- android:paddingVertical="12dp"
4266
- >
4298
+ android:paddingVertical="12dp">
4267
4299
 
4268
4300
  <LinearLayout
4269
4301
  android:id="@+id/ll_chooseDonate"