Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into PankajBranch

# Conflicts:
#	app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt

@@ -93,7 +93,7 @@ interface ApiInterface {
         @Header("token") token: String
     ):  Response<JsonObject>
 
-    @POST("WebApi/api/GetClientDetailV2_S")
+    @POST("WebApi_Bajaj/api/GetClientDetailV2_S")
     suspend fun getClientDetails(
         @Body getClientDetailsRequest: getClientDetailsRequest,
         @Header("token") token: String
@@ -160,4 +160,10 @@ interface ApiInterface {
         @Header("token") token: String
     ): Response<JsonObject>
 
+    @POST("WebApi_Bajaj/api/BankValidationAPI_S")
+    suspend fun bankValidationApi(
+        @Body bankValidationApiRequest: BankValidationApiRequest,
+        @Header("token") token: String
+    ): Response<JsonObject>
+
 }

app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt

@@ -0,0 +1,10 @@
+package com.nivesh.production.bajajfd.model
+
+data class BankValidationApiRequest(
+    var BankAccountNo: String?="",
+    val BankNo: Int?= 0,
+    val IFSC: String?= "",
+    val Name: String? = "",
+    val PhoneNo: String? = "",
+    val RoleId: Int? = 0
+)

app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt

@@ -0,0 +1,8 @@
+package com.nivesh.production.bajajfd.model
+
+data class BankValidationApiResponse(
+    val DataObject: Any,
+    val Message: String,
+    val ObjectResponse: Any,
+    val response: ResponseXXXXXXXXXXXXXX
+)

app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt

@@ -0,0 +1,7 @@
+package com.nivesh.production.bajajfd.model
+
+data class ResponseXXXXXXXXXXXXXX(
+    val message: String,
+    val status: String,
+    val status_code: Int
+)

app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt

@@ -89,4 +89,7 @@ class MainRepository constructor(private val apiInterface: ApiInterface) {
     suspend fun checkFDKYCRequest(checkFDKYCRequest: CheckFDKYCRequest, token: String) =
         apiInterface.checkFDKYC(checkFDKYCRequest, token)
 
+    suspend fun bankValidationApiRequest(bankValidationApiRequest: BankValidationApiRequest, token: String) =
+        apiInterface.bankValidationApi(bankValidationApiRequest, token)
+
 }

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

@@ -792,12 +792,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
 
                                         binding.edtIFSC.setOnItemClickListener { _, _, position, _ ->
                                             if (listOfIFSC.size > 0) {
-                                                val enteredText = binding.edtIFSC.getText()
-                                                Log.d("bankifsc $enteredText",enteredText.toString())
-                                               // binding.edtIFSC.setText(listOfIFSC[position])
                                                 binding.edtIFSC.setText(adapter.getItem(position).toString())
                                                 binding.edtIFSC.setSelection(binding.edtIFSC.text.toString().length)
-                                                getIFSCDetailsApi(enteredText.toString())
+                                                getIFSCDetailsApi(binding.edtIFSC.toString())
                                             }
                                         }
 
@@ -924,9 +921,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
     }
 
     private fun setUpRecyclerView() {
-
         if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isNotEmpty()!!) {
-            binding.rvClientBankList.layoutManager = LinearLayoutManager(activity as BajajFdMainActivity)
+            binding.rvClientBankList.layoutManager =
+                LinearLayoutManager(activity as BajajFdMainActivity)
             bankListAdapter = BankListAdapter(
                 (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist,
                 (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ACCNO1
@@ -1045,31 +1042,23 @@ class StepTwoBajajFDFragment : BaseFragment() {
                                     )
                                     binding.spTitle.setAdapter(adapter)
 
-                                    val titleText = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Client_Title
+                                    val titleText =
+                                        (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Client_Title
                                     val newTitleText = "$titleText."
 
-
-                                    if (titleText.isNullOrEmpty())
-                                    {
-
+                                    if (titleText.isNullOrEmpty()) {
                                         binding.spTitle.setText(
                                             adapter.getItem(0)?.Value,
                                             false
                                         )
-
-
                                     } else {
                                         for (title in listOfTitle) {
                                             if (title.Value == newTitleText) {
                                                 binding.spTitle.setText(title.Value, false)
                                                 break
                                             }
-
                                         }
-
-
                                     }
-
                                     binding.spNomineeTitle.setAdapter(adapter)
                                     binding.spNomineeTitle.setText(
                                         adapter.getItem(0)?.Value,

app/src/main/res/layout/fragment_bajajfd_step_two.xml

@@ -824,6 +824,7 @@
                 <TextView
                     android:id="@+id/tvBankDetails"
                     style="@style/semiBoldStyle"
+                    android:layout_gravity="center"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_5"
@@ -857,7 +858,7 @@
                         android:padding="@dimen/margin_5"
                         android:text="@string/add_new_account"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_size_18"
+                        android:textSize="@dimen/text_size_16"
                         android:textStyle="bold"
                         app:drawableEndCompat="@drawable/ic_add_icon">
 
@@ -1003,6 +1004,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:layout_marginTop="@dimen/margin_5"
                     android:background="@color/greyColor3"
                     android:orientation="horizontal"
@@ -1046,19 +1048,6 @@
 
                 </LinearLayout>
 
-                <TextView
-                    style="@style/regularStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_15"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginBottom="@dimen/margin_20"
-                    android:padding="@dimen/margin_3"
-                    android:text="@string/upto1LakhOnly"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/text_size_14"
-                    tools:layout_editor_absoluteX="5dp" />
-
             </LinearLayout>
 
         </com.google.android.material.card.MaterialCardView>