diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml deleted file mode 100644 index d5e1f0e..0000000 --- a/.idea/dbnavigator.xml +++ /dev/null @@ -1,429 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index a2d7c21..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4b90385..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 33494e8..5821c44 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - namespace 'com.nivesh.production.bajajfd' + namespace 'com.nivesh.production.niveshfd' compileSdk 33 defaultConfig { - applicationId "com.nivesh.production.bajajfd" + applicationId "com.nivesh.production.niveshfd" minSdk 21 targetSdk 33 versionCode 1 diff --git a/app/src/androidTest/java/com/nivesh/production/bajajfd/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/nivesh/production/bajajfd/ExampleInstrumentedTest.kt index 5307e6e..1d32d4e 100644 --- a/app/src/androidTest/java/com/nivesh/production/bajajfd/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/nivesh/production/bajajfd/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd +package com.nivesh.production.niveshfd import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.nivesh.production.bajajfd", appContext.packageName) + assertEquals("com.nivesh.production.niveshfd", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8bcec28..42482cc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ tools:targetApi="31"> diff --git a/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt b/app/src/main/java/com/nivesh/production/niveshfd/NiveshFdApplication.kt similarity index 64% rename from app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt rename to app/src/main/java/com/nivesh/production/niveshfd/NiveshFdApplication.kt index d7f71fe..740572d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/BajajApplication.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/NiveshFdApplication.kt @@ -1,10 +1,10 @@ -package com.nivesh.production.bajajfd +package com.nivesh.production.niveshfd import android.app.Application import android.content.Context -class BajajApplication : Application() { - private var mInstance: BajajApplication? = null +class NiveshFdApplication : Application() { + private var mInstance: NiveshFdApplication? = null companion object { var appContext: Context? = null } diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/BankListAdapter.kt similarity index 95% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/BankListAdapter.kt index ee521eb..6536925 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/BankListAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import android.view.LayoutInflater import android.view.View @@ -6,8 +6,8 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.model.ClientBanklist +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.model.ClientBanklist class BankListAdapter( private val bankList: List?, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/CustomerListAdapter.kt similarity index 90% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/CustomerListAdapter.kt index 40e48d5..04cbdc0 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/CustomerListAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/CustomerListAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import android.view.LayoutInflater import android.view.View @@ -6,8 +6,8 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.google.android.material.switchmaterial.SwitchMaterial -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.model.GetCodes +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.model.GetCodes class CustomerListAdapter( private val customerList: MutableList? diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/DisableAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/DisableAdapter.kt similarity index 94% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/DisableAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/DisableAdapter.kt index d900477..f3e4d00 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/DisableAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/DisableAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/HorizontalRecyclerViewAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/HorizontalRecyclerViewAdapter.kt similarity index 94% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/HorizontalRecyclerViewAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/HorizontalRecyclerViewAdapter.kt index 311fdf1..cff6438 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/HorizontalRecyclerViewAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/HorizontalRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import ROIDataList import android.annotation.SuppressLint @@ -11,9 +11,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.adapter.HorizontalRecyclerViewAdapter.HistoryAdapterViewHolder2 -import com.nivesh.production.bajajfd.interfaces.OnClickListener +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.adapter.HorizontalRecyclerViewAdapter.HistoryAdapterViewHolder2 +import com.nivesh.production.niveshfd.interfaces.OnClickListener class HorizontalRecyclerViewAdapter( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/PaymentModeAdapter.kt similarity index 95% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/PaymentModeAdapter.kt index bde88fd..2ec7ce5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/PaymentModeAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/PaymentModeAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import android.view.LayoutInflater import android.view.View @@ -6,8 +6,8 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.model.GetCodes +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.model.GetCodes class PaymentModeAdapter( private val bankList: List?, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/RecommendedBankListAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/RecommendedBankListAdapter.kt similarity index 87% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/RecommendedBankListAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/RecommendedBankListAdapter.kt index 4b12412..ca39884 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/RecommendedBankListAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/RecommendedBankListAdapter.kt @@ -1,12 +1,12 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.model.Bank +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.model.Bank class RecommendedBankListAdapter( private val bankList: List diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt b/app/src/main/java/com/nivesh/production/niveshfd/adapter/SectionsPagerAdapter.kt similarity index 91% rename from app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt rename to app/src/main/java/com/nivesh/production/niveshfd/adapter/SectionsPagerAdapter.kt index b795476..cb29eea 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/adapter/SectionsPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.adapter +package com.nivesh.production.niveshfd.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiCallback.kt b/app/src/main/java/com/nivesh/production/niveshfd/api/ApiCallback.kt similarity index 90% rename from app/src/main/java/com/nivesh/production/bajajfd/api/ApiCallback.kt rename to app/src/main/java/com/nivesh/production/niveshfd/api/ApiCallback.kt index 308a41f..51e83d9 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiCallback.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/api/ApiCallback.kt @@ -1,6 +1,6 @@ -package com.nivesh.production.bajajfd.api +package com.nivesh.production.niveshfd.api -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.util.Resource import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt b/app/src/main/java/com/nivesh/production/niveshfd/api/ApiClient.kt similarity index 88% rename from app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt rename to app/src/main/java/com/nivesh/production/niveshfd/api/ApiClient.kt index a537cf0..4c7bfa6 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/api/ApiClient.kt @@ -1,8 +1,8 @@ -package com.nivesh.production.bajajfd.api +package com.nivesh.production.niveshfd.api -import com.nivesh.production.bajajfd.BajajApplication -import com.nivesh.production.bajajfd.interfaces.ApiInterface -import com.nivesh.production.bajajfd.util.Constants.Companion.BASE_URL +import com.nivesh.production.niveshfd.NiveshFdApplication +import com.nivesh.production.niveshfd.interfaces.ApiInterface +import com.nivesh.production.niveshfd.util.Constants.Companion.BASE_URL import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit import javax.net.ssl.* class ApiClient { - val context = BajajApplication.appContext + val context = NiveshFdApplication.appContext companion object { private val client by lazy { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/api/TokenAuthenticator.kt b/app/src/main/java/com/nivesh/production/niveshfd/api/TokenAuthenticator.kt similarity index 91% rename from app/src/main/java/com/nivesh/production/bajajfd/api/TokenAuthenticator.kt rename to app/src/main/java/com/nivesh/production/niveshfd/api/TokenAuthenticator.kt index 204cf9d..72bffdf 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/api/TokenAuthenticator.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/api/TokenAuthenticator.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.api +package com.nivesh.production.niveshfd.api import okhttp3.Authenticator import okhttp3.Request diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/ApiInterface.kt similarity index 98% rename from app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt rename to app/src/main/java/com/nivesh/production/niveshfd/interfaces/ApiInterface.kt index f426d2a..a7f3f7a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/ApiInterface.kt @@ -1,7 +1,7 @@ -package com.nivesh.production.bajajfd.interfaces +package com.nivesh.production.niveshfd.interfaces import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.* +import com.nivesh.production.niveshfd.model.* import okhttp3.RequestBody import retrofit2.Response import retrofit2.http.* diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/OnClickListener.java b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/OnClickListener.java similarity index 60% rename from app/src/main/java/com/nivesh/production/bajajfd/interfaces/OnClickListener.java rename to app/src/main/java/com/nivesh/production/niveshfd/interfaces/OnClickListener.java index 2ca2e60..0c0bcac 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/OnClickListener.java +++ b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/OnClickListener.java @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.interfaces; +package com.nivesh.production.niveshfd.interfaces; public interface OnClickListener { void onclickCategory(int position); diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/SendData.kt similarity index 56% rename from app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt rename to app/src/main/java/com/nivesh/production/niveshfd/interfaces/SendData.kt index 13fecab..c50bc11 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/interfaces/SendData.kt @@ -1,6 +1,6 @@ -package com.nivesh.production.bajajfd.interfaces +package com.nivesh.production.niveshfd.interfaces -import com.nivesh.production.bajajfd.model.CreateFDApplicationResponse +import com.nivesh.production.niveshfd.model.CreateFDApplicationResponse interface SendData { fun sendDataFragment(message: CreateFDApplicationResponse) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantDetails.kt similarity index 94% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantDetails.kt index 3d28613..fefa1d7 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ApplicantDetails( var AnnualIncome: String?= null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantRelationDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantRelationDetails.kt similarity index 87% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantRelationDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantRelationDetails.kt index 91eff1b..5a91fe2 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ApplicantRelationDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ApplicantRelationDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ApplicantRelationDetails( var ApplicantMotherFirstName: String? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/Bank.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/Bank.kt similarity index 61% rename from app/src/main/java/com/nivesh/production/bajajfd/model/Bank.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/Bank.kt index b0a0931..3816b94 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/Bank.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/Bank.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class Bank( val BankName: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/BankList.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/BankList.kt similarity index 85% rename from app/src/main/java/com/nivesh/production/bajajfd/model/BankList.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/BankList.kt index ea6bfe9..8b28ac3 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/BankList.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/BankList.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model import java.io.Serializable diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiRequest.kt similarity index 81% rename from app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiRequest.kt index 0b6ae56..e7e600b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class BankValidationApiRequest( var BankAccountNo: String?="", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiResponse.kt similarity index 77% rename from app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiResponse.kt index ef516a9..0dc36e5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/BankValidationApiResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class BankValidationApiResponse( val DataObject: Any, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CheckFDKYCRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CheckFDKYCRequest.kt similarity index 76% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CheckFDKYCRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CheckFDKYCRequest.kt index ad4924a..fe4b289 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CheckFDKYCRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CheckFDKYCRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CheckFDKYCRequest( var DOB: String? ="", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CityListResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CityListResponse.kt similarity index 68% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CityListResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CityListResponse.kt index c14725a..5a39f4a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CityListResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CityListResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CityListResponse( val DataObject: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CityRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CityRequest.kt similarity index 88% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CityRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CityRequest.kt index 9c20f7a..0e89901 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CityRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CityRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CityRequest( var APIName: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientBanklist.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientBanklist.kt similarity index 84% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ClientBanklist.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ClientBanklist.kt index 04a1ed1..46bf461 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientBanklist.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientBanklist.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ClientBanklist( var AccountNumber: String?="", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientDetails.kt similarity index 92% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ClientDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ClientDetails.kt index 38c73cd..1a50d86 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ClientDetails( val ARNexpiredFlag: Boolean, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientMasterMFD.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientMasterMFD.kt similarity index 96% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ClientMasterMFD.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ClientMasterMFD.kt index dfcfec8..f17a763 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ClientMasterMFD.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ClientMasterMFD.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ClientMasterMFD( val CLIENT_ACCNO1: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationRequest.kt similarity index 89% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationRequest.kt index a5c8d1e..ca5c336 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CreateFDApplicationRequest( var ApplicantDetails: ApplicantDetails ? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationResponse.kt similarity index 63% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationResponse.kt index 3465640..ad87104 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDApplicationResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CreateFDApplicationResponse( val Response: ResponseXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDRequest.kt similarity index 68% rename from app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDRequest.kt index 3921974..85d2fae 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/CreateFDRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class CreateFDRequest( var CreateFDApplicationRequest: CreateFDApplicationRequest? = null diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/DataObject.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/DataObject.kt similarity index 89% rename from app/src/main/java/com/nivesh/production/bajajfd/model/DataObject.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/DataObject.kt index bdf0cbb..95e6eef 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/DataObject.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/DataObject.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model import java.io.Serializable diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/DataObjectX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/DataObjectX.kt similarity index 76% rename from app/src/main/java/com/nivesh/production/bajajfd/model/DataObjectX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/DataObjectX.kt index 7599a9d..76bb658 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/DataObjectX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/DataObjectX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class DataObjectX( val city_id: Int, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/DeviceInfo.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/DeviceInfo.kt similarity index 87% rename from app/src/main/java/com/nivesh/production/bajajfd/model/DeviceInfo.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/DeviceInfo.kt index d7b0b88..a32599b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/DeviceInfo.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/DeviceInfo.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class DeviceInfo( var app_version: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/DocumentUpload.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/DocumentUpload.kt similarity index 84% rename from app/src/main/java/com/nivesh/production/bajajfd/model/DocumentUpload.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/DocumentUpload.kt index e0f8154..1aa3dfb 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/DocumentUpload.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/DocumentUpload.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class DocumentUpload( var Description: String? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/Errors.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/Errors.kt similarity index 61% rename from app/src/main/java/com/nivesh/production/bajajfd/model/Errors.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/Errors.kt index a2c80e2..f6857fd 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/Errors.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/Errors.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class Errors( val ErrorCode: Int, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FDCreationDetailsResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FDCreationDetailsResponse.kt similarity index 72% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FDCreationDetailsResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FDCreationDetailsResponse.kt index 2d4524c..c2f9d1d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FDCreationDetailsResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FDCreationDetailsResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FDCreationDetailsResponse( val DocumentUploadFlag: Int, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FDDataResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FDDataResponse.kt similarity index 83% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FDDataResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FDDataResponse.kt index 325e7e6..a47833c 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FDDataResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FDDataResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FDDataResponse( val FDAmount: Double, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FDInvestmentDetails.kt similarity index 91% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FDInvestmentDetails.kt index 276ca56..d070554 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FDInvestmentDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FDInvestmentDetails( var CKYCNumber: String? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FDStepsCountRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FDStepsCountRequest.kt similarity index 69% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FDStepsCountRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FDStepsCountRequest.kt index 79a9e1d..1a6eeb1 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FDStepsCountRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FDStepsCountRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FDStepsCountRequest( var FDProvider: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FdBankDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FdBankDetails.kt similarity index 83% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FdBankDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FdBankDetails.kt index f292a4c..c778cda 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FdBankDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FdBankDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FdBankDetails( var AccountNumber: String?= null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FinaliseFD.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FinaliseFD.kt similarity index 73% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FinaliseFD.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FinaliseFD.kt index b487f60..c8b09ff 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FinaliseFD.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FinaliseFD.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FinaliseFD( var FDProvider: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDRequest.kt similarity index 60% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDRequest.kt index e77b6bf..12f991b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FinalizeFDRequest( var FinaliseFD: FinaliseFD? = null diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDResponse.kt similarity index 61% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDResponse.kt index ea2554c..7070db1 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeFDResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeFDResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FinalizeFDResponse( val Response: ResponseXXXXXXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeKYCRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeKYCRequest.kt similarity index 74% rename from app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeKYCRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeKYCRequest.kt index cb1e51e..65c87da 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FinalizeKYCRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/FinalizeKYCRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class FinalizeKYCRequest( var FDProvider: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCalculateMaturityAmountResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCalculateMaturityAmountResponse.kt similarity index 62% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetCalculateMaturityAmountResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetCalculateMaturityAmountResponse.kt index 9f98c13..6fc5693 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCalculateMaturityAmountResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCalculateMaturityAmountResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetCalculateMaturityAmountResponse( val Response: ResponseXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeRequest.kt similarity index 78% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeRequest.kt index 7a890aa..9f60c1d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetCodeRequest( var Category: String ? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeResponse.kt similarity index 55% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeResponse.kt index ea8687d..a5c2769 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodeResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodeResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetCodeResponse( val Response: ResponseX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodes.kt similarity index 78% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetCodes.kt index 8e4df4c..26747eb 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetCodes.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetCodes.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetCodes( val Label: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDBankListResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDBankListResponse.kt similarity index 60% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetFDBankListResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetFDBankListResponse.kt index cebf1e3..fe53b46 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDBankListResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDBankListResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetFDBankListResponse( val Response: ResponseXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsRequest.kt similarity index 75% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsRequest.kt index 7cde245..121b07f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetFDDetailsRequest( var FDProvider: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsResponse.kt similarity index 61% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsResponse.kt index 15f4af7..fed5d3b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetFDDetailsResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetFDDetailsResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetFDDetailsResponse( val Response: ResponseXXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeListResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeListResponse.kt similarity index 71% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeListResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeListResponse.kt index 7e31899..8050a33 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeListResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeListResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetIFSCCodeListResponse( val IFSCCodes: MutableList, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeResponse.kt similarity index 66% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeResponse.kt index 21338dd..42f119e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetIFSCCodeResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetIFSCCodeResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetIFSCCodeResponse( val IFSCCODEServiceResult: List diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetMaturityAmountRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetMaturityAmountRequest.kt similarity index 80% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetMaturityAmountRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetMaturityAmountRequest.kt index 9d0112f..3d02be0 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetMaturityAmountRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetMaturityAmountRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class GetMaturityAmountRequest( var FDAmount: Int? = 0, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetRatesRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetRatesRequest.kt similarity index 85% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetRatesRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetRatesRequest.kt index 6553a5e..7db281e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/GetRatesRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/GetRatesRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/GetRatesResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/GetRatesResponse.kt similarity index 100% rename from app/src/main/java/com/nivesh/production/bajajfd/model/GetRatesResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/GetRatesResponse.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/IFSCCODEServiceResult.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/IFSCCODEServiceResult.kt similarity index 81% rename from app/src/main/java/com/nivesh/production/bajajfd/model/IFSCCODEServiceResult.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/IFSCCODEServiceResult.kt index 717ce5f..1c2626c 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/IFSCCODEServiceResult.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/IFSCCODEServiceResult.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class IFSCCODEServiceResult( val BankBranch: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/Nominee.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/Nominee.kt similarity index 86% rename from app/src/main/java/com/nivesh/production/bajajfd/model/Nominee.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/Nominee.kt index 31c1ae6..43e5628 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/Nominee.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/Nominee.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class Nominee( val NomineeApplicablePercent: Double, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/NomineeDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/NomineeDetails.kt similarity index 92% rename from app/src/main/java/com/nivesh/production/bajajfd/model/NomineeDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/NomineeDetails.kt index 456e518..36c2714 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/NomineeDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/NomineeDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class NomineeDetails( var NomineeAddress1: String?= null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/NomineeGuardianDetails.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/NomineeGuardianDetails.kt similarity index 90% rename from app/src/main/java/com/nivesh/production/bajajfd/model/NomineeGuardianDetails.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/NomineeGuardianDetails.kt index 9416a47..a76b4db 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/NomineeGuardianDetails.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/NomineeGuardianDetails.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class NomineeGuardianDetails( var GuardianAddress1: String?= null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ObjectResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ObjectResponse.kt similarity index 81% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ObjectResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ObjectResponse.kt index ae043f7..5aab4be 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ObjectResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ObjectResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ObjectResponse( val TransactionCount: Int, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckRequest.kt similarity index 89% rename from app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckRequest.kt index 6a823eb..61c75de 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckResponse.kt similarity index 56% rename from app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckResponse.kt index 5cae1b6..ff3a603 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/PanCheckResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/PanCheckResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class PanCheckResponse( val response: ResponseXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryRequest.kt similarity index 69% rename from app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryRequest.kt index b7391d7..128b543 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class PaymentReQueryRequest( var NiveshClientCode: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryResponse.kt similarity index 62% rename from app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryResponse.kt index 82d78d9..7bc7a37 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/PaymentReQueryResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class PaymentReQueryResponse( val Response: ResponseXXXXXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ROIDataList.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ROIDataList.kt similarity index 100% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ROIDataList.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ROIDataList.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/Response.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/Response.kt similarity index 76% rename from app/src/main/java/com/nivesh/production/bajajfd/model/Response.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/Response.kt index c479c7f..039c987 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/Response.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/Response.kt @@ -1,4 +1,4 @@ -import com.nivesh.production.bajajfd.model.Errors +import com.nivesh.production.niveshfd.model.Errors data class Response( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseX.kt similarity index 78% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseX.kt index 06a1cde..ba40f7f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXX.kt similarity index 77% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXX.kt index 1ec3e62..82b31ca 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXX.kt similarity index 68% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXX.kt index 3420420..0fd918c 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXX.kt similarity index 77% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXX.kt index 0c37922..03c4245 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXX.kt similarity index 68% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXX.kt index 3b668b5..e0470e2 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXX.kt similarity index 68% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXX.kt index cce2013..6e2a109 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXX.kt similarity index 69% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXX.kt index 1adec00..258b005 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXX.kt similarity index 77% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXX.kt index a48dfa5..39b2c4a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXX( val BankList: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXX.kt similarity index 69% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXX.kt index 128fad0..57e251c 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXX.kt similarity index 69% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXX.kt index 092b2f9..7afd560 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXX.kt similarity index 81% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXX.kt index cf7ddc5..2a2852d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXX.kt similarity index 64% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXX.kt index 187adc4..b6f77ff 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXX.kt @@ -1,6 +1,6 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.util.Resource data class ResponseXXXXXXXXXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXX.kt similarity index 75% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXX.kt index d140607..5f2e8e5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXX.kt similarity index 70% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXX.kt index e470814..e5c840e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXXXXXX( val message: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXX.kt similarity index 75% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXX.kt index 02339b2..97c4faa 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXXXXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt similarity index 78% rename from app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXXX.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt index c16ac00..a75c2e9 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class ResponseXXXXXXXXXXXXXXXX( val Errors: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataRequest.kt similarity index 78% rename from app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataRequest.kt index 5558f83..c3fd43d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class SaveFDOtherDataRequest( var FDProvider: String?= "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataResponse.kt similarity index 62% rename from app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataResponse.kt index d1cd6f4..87e7cb0 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/SaveFDOtherDataResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/SaveFDOtherDataResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class SaveFDOtherDataResponse( val Response: ResponseXXXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/StateListResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/StateListResponse.kt similarity index 76% rename from app/src/main/java/com/nivesh/production/bajajfd/model/StateListResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/StateListResponse.kt index 8ed273c..a5a1318 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/StateListResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/StateListResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class StateListResponse( val DataObject: List, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/StepsCountResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/StepsCountResponse.kt similarity index 57% rename from app/src/main/java/com/nivesh/production/bajajfd/model/StepsCountResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/StepsCountResponse.kt index b0266d1..de23e9e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/StepsCountResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/StepsCountResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class StepsCountResponse( val Response: ResponseXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/UploadResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/UploadResponse.kt similarity index 59% rename from app/src/main/java/com/nivesh/production/bajajfd/model/UploadResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/UploadResponse.kt index a9a1560..c45e362 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/UploadResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/UploadResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class UploadResponse( val Response: ResponseXXXXXXXXXXXX diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/UserRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/UserRequest.kt similarity index 82% rename from app/src/main/java/com/nivesh/production/bajajfd/model/UserRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/UserRequest.kt index b6a37e6..8af2431 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/UserRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/UserRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class UserRequest( var AppOrWeb: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsRequest.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsRequest.kt similarity index 80% rename from app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsRequest.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsRequest.kt index e140749..9f368ae 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsRequest.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsRequest.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class getClientDetailsRequest( var AppOrWeb: String? = "", diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsResponse.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsResponse.kt similarity index 79% rename from app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsResponse.kt rename to app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsResponse.kt index a60896a..8514198 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/getClientDetailsResponse.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/getClientDetailsResponse.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.model +package com.nivesh.production.niveshfd.model data class getClientDetailsResponse( // val DataObject: Any ?, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/niveshfd/repositories/MainRepository.kt similarity index 96% rename from app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt rename to app/src/main/java/com/nivesh/production/niveshfd/repositories/MainRepository.kt index 23eef56..6532291 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/repositories/MainRepository.kt @@ -1,7 +1,7 @@ -package com.nivesh.production.bajajfd.repositories +package com.nivesh.production.niveshfd.repositories -import com.nivesh.production.bajajfd.interfaces.ApiInterface -import com.nivesh.production.bajajfd.model.* +import com.nivesh.production.niveshfd.interfaces.ApiInterface +import com.nivesh.production.niveshfd.model.* class MainRepository constructor(private val apiInterface: ApiInterface) { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BaseActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/BaseActivity.kt similarity index 86% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BaseActivity.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/activity/BaseActivity.kt index fc035c6..1ac77d4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BaseActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/BaseActivity.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.activity +package com.nivesh.production.niveshfd.ui.activity import android.app.Activity import android.os.Bundle diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt similarity index 85% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt index af50bde..f8f03e9 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.activity +package com.nivesh.production.niveshfd.ui.activity import android.annotation.SuppressLint import android.app.Dialog @@ -15,37 +15,36 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.viewpager.widget.ViewPager import com.google.gson.Gson -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.adapter.DisableAdapter -import com.nivesh.production.bajajfd.adapter.SectionsPagerAdapter -import com.nivesh.production.bajajfd.api.ApiClient -import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.ui.fragment.* -import com.nivesh.production.bajajfd.ui.providerfactory.* -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.defaultShape -import com.nivesh.production.bajajfd.util.Common.Companion.getDate -import com.nivesh.production.bajajfd.util.Common.Companion.selectedShape -import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.ProgressUtil -import com.nivesh.production.bajajfd.util.ProgressUtil.hideLoading -import com.nivesh.production.bajajfd.util.ProgressUtil.showLoading -import com.nivesh.production.bajajfd.util.Resource -import com.nivesh.production.bajajfd.viewModel.* - - -class BajajFdMainActivity : BaseActivity() { - lateinit var binding: ActivityBajajFdBinding +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.adapter.DisableAdapter +import com.nivesh.production.niveshfd.adapter.SectionsPagerAdapter +import com.nivesh.production.niveshfd.api.ApiClient +import com.nivesh.production.niveshfd.databinding.ActivityNiveshFdBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.repositories.MainRepository +import com.nivesh.production.niveshfd.ui.fragment.* +import com.nivesh.production.niveshfd.ui.providerfactory.* +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Common.Companion.defaultShape +import com.nivesh.production.niveshfd.util.Common.Companion.getDate +import com.nivesh.production.niveshfd.util.Common.Companion.selectedShape +import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation +import com.nivesh.production.niveshfd.util.Constants.Companion.token +import com.nivesh.production.niveshfd.util.ProgressUtil.hideLoading +import com.nivesh.production.niveshfd.util.ProgressUtil.showLoading +import com.nivesh.production.niveshfd.util.Resource +import com.nivesh.production.niveshfd.viewModel.* + + +class NiveshFdMainActivity : BaseActivity() { + lateinit var binding: ActivityNiveshFdBinding lateinit var viewModel: BajajFDViewModel - private val stepOneBajajFDFragment = StepOneBajajFDFragment() - private val stepTwoBajajFDFragment = StepTwoBajajFDFragment() - private val stepThreeBajajFDFragment = StepThreeBajajFDFragment() - private val stepFourBajajFDFragment = StepFourBajajFDFragment() - private val stepFiveBajajFDFragment = StepFiveBajajFDFragment() + private val stepOneNiveshFDFragment = StepOneNiveshFDFragment() + private val stepTwoNiveshFDFragment = StepTwoNiveshFDFragment() + private val stepThreeNiveshFDFragment = StepThreeNiveshFDFragment() + private val stepFourBajajFDFragment = StepFourNiveshFDFragment() + private val stepFiveNiveshFDFragment = StepFiveNiveshFDFragment() var createFDRequest: CreateFDRequest = CreateFDRequest() var createFDApplicantRequest: CreateFDApplicationRequest = CreateFDApplicationRequest() @@ -71,10 +70,10 @@ class BajajFdMainActivity : BaseActivity() { private fun init() { //start Repository viewModel = ViewModelProvider( - this@BajajFdMainActivity, + this@NiveshFdMainActivity, FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) )[BajajFDViewModel::class.java] - binding = ActivityBajajFdBinding.inflate(layoutInflater) + binding = ActivityNiveshFdBinding.inflate(layoutInflater) binding.apply { setContentView(this.root) } @@ -116,7 +115,7 @@ class BajajFdMainActivity : BaseActivity() { 650 -> "" else -> { showDialogValidation( - this@BajajFdMainActivity, + this@NiveshFdMainActivity, stepsCountResponse.Response.Errors[0].ErrorMessage ) } @@ -125,7 +124,7 @@ class BajajFdMainActivity : BaseActivity() { } is Resource.Error -> { response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) + showDialogValidation(this@NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -140,7 +139,7 @@ class BajajFdMainActivity : BaseActivity() { } private fun getClientDetailsApi(stepsCount: Int) { - if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { + if (Common.isNetworkAvailable(this@NiveshFdMainActivity)) { val getClientDetailsRequest = getClientDetailsRequest() getClientDetailsRequest.client_code = "8872" getClientDetailsRequest.AppOrWeb = getString(R.string.app) @@ -164,7 +163,7 @@ class BajajFdMainActivity : BaseActivity() { userRequest.deviceInfo = deviceInfo getClientDetailsRequest.UserRequest = userRequest Log.e("getClientDetail ", " Request -->" + Gson().toJson(getClientDetailsRequest)) - showLoading(this@BajajFdMainActivity) + showLoading(this@NiveshFdMainActivity) viewModel.getClientDetails(getClientDetailsRequest, token, this) viewModel.getClientDetailsMutableData.observe(this) { response -> when (response) { @@ -183,7 +182,7 @@ class BajajFdMainActivity : BaseActivity() { } // 650 -> refreshToken() else -> { - showDialogValidation(this@BajajFdMainActivity, response.message) + showDialogValidation(this@NiveshFdMainActivity, response.message) } } } @@ -191,7 +190,7 @@ class BajajFdMainActivity : BaseActivity() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) + showDialogValidation(this@NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -211,18 +210,18 @@ class BajajFdMainActivity : BaseActivity() { if (stepCount == 3) { fragments = arrayOf( - stepOneBajajFDFragment, - stepTwoBajajFDFragment, + stepOneNiveshFDFragment, + stepTwoNiveshFDFragment, stepFourBajajFDFragment, - stepFiveBajajFDFragment + stepFiveNiveshFDFragment ) } else if (stepCount == 4) { fragments = arrayOf( - stepOneBajajFDFragment, - stepTwoBajajFDFragment, - stepThreeBajajFDFragment, + stepOneNiveshFDFragment, + stepTwoNiveshFDFragment, + stepThreeNiveshFDFragment, stepFourBajajFDFragment, - stepFiveBajajFDFragment + stepFiveNiveshFDFragment ) } @@ -302,7 +301,7 @@ class BajajFdMainActivity : BaseActivity() { } private fun checkFDCKYCApi() { - if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { + if (Common.isNetworkAvailable(this@NiveshFdMainActivity)) { if (getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CM_MOBILE?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE?.isNotEmpty()!!) { val checkFDKYCRequest = CheckFDKYCRequest() checkFDKYCRequest.Mobile = @@ -332,7 +331,7 @@ class BajajFdMainActivity : BaseActivity() { // 650 -> refreshToken() else -> { showDialogValidation( - this@BajajFdMainActivity, + this@NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -342,7 +341,7 @@ class BajajFdMainActivity : BaseActivity() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) + showDialogValidation(this@NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -403,7 +402,7 @@ class BajajFdMainActivity : BaseActivity() { fun paymentDialog(payUrl: String, value: String) { Log.e("payUrl", "-->$payUrl") Log.e("value", "-->$value") - dialogWebView = Dialog(this@BajajFdMainActivity) + dialogWebView = Dialog(this@NiveshFdMainActivity) dialogWebView!!.setContentView(R.layout.row_fd_pay) dialogWebView!!.setCancelable(true) val tvCancel = dialogWebView!!.findViewById(R.id.tvCancel) @@ -445,7 +444,7 @@ class BajajFdMainActivity : BaseActivity() { paymentReQueryRequest.UniqueId = uniqueId paymentReQueryRequest.NiveshClientCode = getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - ProgressUtil.showLoading(this@BajajFdMainActivity) + showLoading(this@NiveshFdMainActivity) viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) viewModel.getPaymentReQueryMutableData.observe(this) { response -> when (response) { @@ -465,14 +464,14 @@ class BajajFdMainActivity : BaseActivity() { } else { binding.viewPager.currentItem = 3 } - stepFiveBajajFDFragment.getData(paymentReQueryResponse) + stepFiveNiveshFDFragment.getData(paymentReQueryResponse) } } } } is Resource.Error -> { response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) + showDialogValidation(this@NiveshFdMainActivity, message) } } is Resource.Loading -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt similarity index 70% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt index 224961c..92adfac 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.fragment +package com.nivesh.production.niveshfd.ui.fragment import android.os.Bundle import android.util.Log @@ -8,17 +8,17 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.google.gson.Gson -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Constants -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepFiveBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Constants +import com.nivesh.production.niveshfd.util.Resource -class StepFiveBajajFDFragment : Fragment() { +class StepFiveNiveshFDFragment : Fragment() { - private var _binding: FragmentBajajfdStepFiveBinding? = null + private var _binding: FragmentNiveshfdStepFiveBinding? = null private val binding get() = _binding!! override fun onCreateView( @@ -26,7 +26,7 @@ class StepFiveBajajFDFragment : Fragment() { savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false) + _binding = FragmentNiveshfdStepFiveBinding.inflate(inflater, container, false) return binding.root } @@ -47,7 +47,7 @@ class StepFiveBajajFDFragment : Fragment() { binding.tvCongrats.text = arrOfStr[0] binding.tvCongrats.setTextColor( ContextCompat.getColor( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.color.green ) ) @@ -59,7 +59,7 @@ class StepFiveBajajFDFragment : Fragment() { binding.tvCongrats.text = arrOfStr[0] binding.tvCongrats.setTextColor( ContextCompat.getColor( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.color.red ) ) @@ -74,14 +74,14 @@ class StepFiveBajajFDFragment : Fragment() { val finalizeFDRequest = FinalizeFDRequest() val finaliseFD = FinaliseFD() finaliseFD.FDProvider = getString(R.string.bajaj) - finaliseFD.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - finaliseFD.UniqueId = (activity as BajajFdMainActivity).uniqueId + finaliseFD.NiveshClientCode = (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + finaliseFD.UniqueId = (activity as NiveshFdMainActivity).uniqueId finalizeFDRequest.FinaliseFD = finaliseFD - (activity as BajajFdMainActivity).viewModel.finaliseFD( - finalizeFDRequest, Constants.token, activity as BajajFdMainActivity + (activity as NiveshFdMainActivity).viewModel.finaliseFD( + finalizeFDRequest, Constants.token, activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getFinalizeFDMutableData.observe(viewLifecycleOwner){ response -> + (activity as NiveshFdMainActivity).viewModel.getFinalizeFDMutableData.observe(viewLifecycleOwner){ response -> when (response) { is Resource.Success -> { Log.e("finalizeKYC ", " response-->${response.data.toString()}") @@ -95,7 +95,7 @@ class StepFiveBajajFDFragment : Fragment() { 650 -> "" else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, finalizeFDResponse.Response.Errors[0].ErrorMessage ) } @@ -105,7 +105,7 @@ class StepFiveBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -121,12 +121,12 @@ class StepFiveBajajFDFragment : Fragment() { private fun finalizeKYCApi() { val finalizeKYCRequest = FinalizeKYCRequest() finalizeKYCRequest.FDProvider = getString(R.string.bajaj) - finalizeKYCRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - finalizeKYCRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId - (activity as BajajFdMainActivity).viewModel.finaliseKYC( - finalizeKYCRequest, Constants.token, activity as BajajFdMainActivity + finalizeKYCRequest.NiveshClientCode = (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + finalizeKYCRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId + (activity as NiveshFdMainActivity).viewModel.finaliseKYC( + finalizeKYCRequest, Constants.token, activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getFinalizeKYCMutableData.observe(viewLifecycleOwner){ response -> + (activity as NiveshFdMainActivity).viewModel.getFinalizeKYCMutableData.observe(viewLifecycleOwner){ response -> when (response) { is Resource.Success -> { Log.e("finalizeKYC ", " response-->${response.data.toString()}") @@ -140,7 +140,7 @@ class StepFiveBajajFDFragment : Fragment() { 650 -> "" else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, finalizeFDResponse.Response.Errors[0].ErrorMessage ) } @@ -150,7 +150,7 @@ class StepFiveBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt similarity index 74% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt index 8918585..a1fbd5f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.fragment +package com.nivesh.production.niveshfd.ui.fragment import android.os.Bundle import android.util.Log @@ -9,20 +9,20 @@ import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.google.gson.Gson -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.adapter.CustomerListAdapter -import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.ProgressUtil -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.adapter.CustomerListAdapter +import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepFourBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation +import com.nivesh.production.niveshfd.util.Constants.Companion.token +import com.nivesh.production.niveshfd.util.ProgressUtil +import com.nivesh.production.niveshfd.util.Resource -class StepFourBajajFDFragment : Fragment() { +class StepFourNiveshFDFragment : Fragment() { - private var _binding: FragmentBajajfdStepFourBinding? = null + private var _binding: FragmentNiveshfdStepFourBinding? = null private val binding get() = _binding!! private lateinit var listOfCustomer: MutableList @@ -35,14 +35,14 @@ class StepFourBajajFDFragment : Fragment() { savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepFourBinding.inflate(inflater, container, false) + _binding = FragmentNiveshfdStepFourBinding.inflate(inflater, container, false) return binding.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if ((activity as BajajFdMainActivity).loginRole == 5) { + if ((activity as NiveshFdMainActivity).loginRole == 5) { binding.btnNext.text = getString(R.string.pay) binding.btnNext.setBackgroundColor( ResourcesCompat.getColor( @@ -74,13 +74,13 @@ class StepFourBajajFDFragment : Fragment() { } } if (validated()) { - if ((activity as BajajFdMainActivity).loginRole == 5) { + if ((activity as NiveshFdMainActivity).loginRole == 5) { val saveFDOtherDataRequest = SaveFDOtherDataRequest() saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) - saveFDOtherDataRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId + saveFDOtherDataRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId saveFDOtherDataRequest.Values = selectedList saveFDOtherDataRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE saveFDOtherData(saveFDOtherDataRequest, payUrl, value) } else { // go to view order @@ -89,10 +89,10 @@ class StepFourBajajFDFragment : Fragment() { } binding.btnBack.setOnClickListener { - if ((activity as BajajFdMainActivity).stepCount == 4) { - (activity as BajajFdMainActivity).binding.viewPager.currentItem = 2 + if ((activity as NiveshFdMainActivity).stepCount == 4) { + (activity as NiveshFdMainActivity).binding.viewPager.currentItem = 2 } else { - (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 + (activity as NiveshFdMainActivity).binding.viewPager.currentItem = 1 } } } @@ -100,13 +100,13 @@ class StepFourBajajFDFragment : Fragment() { private fun validated(): Boolean { if (selectedList.isEmpty()) { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getString(R.string.validTermsCondition) ) return false } else if (!binding.checkBox.isChecked) { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, resources.getString(R.string.validTermsConditions) ) return false @@ -116,13 +116,13 @@ class StepFourBajajFDFragment : Fragment() { } private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) { - ProgressUtil.showLoading(activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.saveFDOtherData( + ProgressUtil.showLoading(activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.saveFDOtherData( data, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getFDOtherMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("saveFDOtherData", " response -->${response.data.toString()}") @@ -134,12 +134,12 @@ class StepFourBajajFDFragment : Fragment() { saveFDOtherDataResponse.Response.StatusCode.let { code -> when (code) { 200 -> { - (activity as BajajFdMainActivity).stepFourApi(payUrl, value) + (activity as NiveshFdMainActivity).stepFourApi(payUrl, value) } // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, saveFDOtherDataResponse.Response.Errors[0].ErrorMessage ) } @@ -149,7 +149,7 @@ class StepFourBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -173,12 +173,12 @@ class StepFourBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.customerCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.customerListApi( + (activity as NiveshFdMainActivity).viewModel.customerListApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.customerListMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.customerListMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -197,7 +197,7 @@ class StepFourBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Message ) } @@ -207,7 +207,7 @@ class StepFourBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -222,26 +222,26 @@ class StepFourBajajFDFragment : Fragment() { private fun setUpRecyclerView(getCustomerList: MutableList) { binding.rvTerms.layoutManager = - LinearLayoutManager(activity as BajajFdMainActivity) + LinearLayoutManager(activity as NiveshFdMainActivity) val customerListAdapter = CustomerListAdapter(getCustomerList) binding.rvTerms.adapter = customerListAdapter } private fun getFDDetailsApi() { - if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { + if (Common.isNetworkAvailable(activity as NiveshFdMainActivity)) { val getFDDetailsRequest = GetFDDetailsRequest() getFDDetailsRequest.FDProvider = getString(R.string.bajaj) getFDDetailsRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - getFDDetailsRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId - ProgressUtil.showLoading(activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getFDDetails( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + getFDDetailsRequest.UniqueId = (activity as NiveshFdMainActivity).uniqueId + ProgressUtil.showLoading(activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getFDDetails( getFDDetailsRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getFDDetailsMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getFDDetailsMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -271,7 +271,7 @@ class StepFourBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getFDDetailsResponse.Response.Errors[0].ErrorMessage ) } @@ -281,7 +281,7 @@ class StepFourBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt similarity index 81% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt index c5700bb..bef87f2 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.fragment +package com.nivesh.production.niveshfd.ui.fragment import GetRatesResponse import ROIDataList @@ -17,20 +17,20 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView.LayoutManager import com.google.gson.Gson -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.adapter.HorizontalRecyclerViewAdapter -import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod -import com.nivesh.production.bajajfd.util.Common.Companion.removeError -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.Resource - - -class StepOneBajajFDFragment : Fragment() { - private var _binding: FragmentBajajfdStepOneBinding? = null +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.adapter.HorizontalRecyclerViewAdapter +import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepOneBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorMethod +import com.nivesh.production.niveshfd.util.Common.Companion.removeError +import com.nivesh.production.niveshfd.util.Constants.Companion.token +import com.nivesh.production.niveshfd.util.Resource + + +class StepOneNiveshFDFragment : Fragment() { + private var _binding: FragmentNiveshfdStepOneBinding? = null private val binding get() = _binding!! private lateinit var rgMaturity: RadioButton @@ -46,7 +46,7 @@ class StepOneBajajFDFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepOneBinding.inflate(inflater, container, false) + _binding = FragmentNiveshfdStepOneBinding.inflate(inflater, container, false) return binding.root } @@ -58,7 +58,7 @@ class StepOneBajajFDFragment : Fragment() { listOfMaxAmount = ArrayList() listOfFrequency = ArrayList() - rgMaturity = RadioButton(activity as BajajFdMainActivity) + rgMaturity = RadioButton(activity as NiveshFdMainActivity) binding.edtAmount.filters = arrayOf(InputFilter.LengthFilter(8)) // upto 1 Cr // Amount binding.edtAmount.addTextChangedListener(object : TextWatcher { @@ -115,40 +115,40 @@ class StepOneBajajFDFragment : Fragment() { // Next Button binding.btnNext.setOnClickListener { if (validation()) { - (activity as BajajFdMainActivity).fdInvestmentDetails.FDAmount = + (activity as NiveshFdMainActivity).fdInvestmentDetails.FDAmount = binding.edtAmount.text.toString().toDouble() - (activity as BajajFdMainActivity).fdInvestmentDetails.Frequency = + (activity as NiveshFdMainActivity).fdInvestmentDetails.Frequency = binding.spInterestPayout.text.toString() - (activity as BajajFdMainActivity).fdInvestmentDetails.Tenure = tenure - (activity as BajajFdMainActivity).fdInvestmentDetails.Interest = interest - (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - (activity as BajajFdMainActivity).fdInvestmentDetails.Provider = + (activity as NiveshFdMainActivity).fdInvestmentDetails.Tenure = tenure + (activity as NiveshFdMainActivity).fdInvestmentDetails.Interest = interest + (activity as NiveshFdMainActivity).fdInvestmentDetails.NiveshClientCode = + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + (activity as NiveshFdMainActivity).fdInvestmentDetails.Provider = getString(R.string.bajaj) - (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23" - (activity as BajajFdMainActivity).fdInvestmentDetails.Device = + (activity as NiveshFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23" + (activity as NiveshFdMainActivity).fdInvestmentDetails.Device = getString(R.string.app) - (activity as BajajFdMainActivity).fdInvestmentDetails.Source = + (activity as NiveshFdMainActivity).fdInvestmentDetails.Source = getString(R.string.source) if (binding.swSeniorCitizen.isChecked) { - (activity as BajajFdMainActivity).fdInvestmentDetails.CitizenType = + (activity as NiveshFdMainActivity).fdInvestmentDetails.CitizenType = getString(R.string.seniorCitizen) } else { - (activity as BajajFdMainActivity).fdInvestmentDetails.CitizenType = + (activity as NiveshFdMainActivity).fdInvestmentDetails.CitizenType = getString(R.string.nonSeniorCitizen) } - (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = "" - (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = "" - (activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = - (activity as BajajFdMainActivity).uniqueId + (activity as NiveshFdMainActivity).fdInvestmentDetails.CustomerType = "" + (activity as NiveshFdMainActivity).fdInvestmentDetails.CKYCNumber = "" + (activity as NiveshFdMainActivity).fdInvestmentDetails.UniqueId = + (activity as NiveshFdMainActivity).uniqueId - (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = - (activity as BajajFdMainActivity).fdInvestmentDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = + (activity as NiveshFdMainActivity).fdInvestmentDetails Log.e( "StepOneData", - "-->" + Gson().toJson((activity as BajajFdMainActivity).fdInvestmentDetails) + "-->" + Gson().toJson((activity as NiveshFdMainActivity).fdInvestmentDetails) ) - (activity as BajajFdMainActivity).stepOneApi() + (activity as NiveshFdMainActivity).stepOneApi() } } @@ -162,12 +162,12 @@ class StepOneBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.category) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getCode( + (activity as NiveshFdMainActivity).viewModel.getCode( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getCodeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("interestPayoutApi", " response -->${response.data.toString()}") @@ -179,7 +179,7 @@ class StepOneBajajFDFragment : Fragment() { listOfFrequency = getCodeResponse.Response.GetCodesList if (listOfFrequency.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfFrequency ) @@ -193,7 +193,7 @@ class StepOneBajajFDFragment : Fragment() { getRatesApi() }else{ Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, "Interest Payout Frequency Data Is Missing." ) } @@ -201,7 +201,7 @@ class StepOneBajajFDFragment : Fragment() { 650 -> "" else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -211,7 +211,7 @@ class StepOneBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -230,12 +230,12 @@ class StepOneBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.minAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getMinAmount( + (activity as NiveshFdMainActivity).viewModel.getMinAmount( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getMinAmountMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getMinAmountMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -257,7 +257,7 @@ class StepOneBajajFDFragment : Fragment() { 650 -> "" else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -267,7 +267,7 @@ class StepOneBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -286,12 +286,12 @@ class StepOneBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.MaxAmountCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.getMaxAmount( + (activity as NiveshFdMainActivity).viewModel.getMaxAmount( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getMaxAmountMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getMaxAmountMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -307,7 +307,7 @@ class StepOneBajajFDFragment : Fragment() { 650 -> "" else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -317,7 +317,7 @@ class StepOneBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -333,7 +333,7 @@ class StepOneBajajFDFragment : Fragment() { private fun setUpRecyclerView() { recyclerViewDropDownAdapter = HorizontalRecyclerViewAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, listOfTenure ) { position -> tenure = listOfTenure[position].Tenure.toInt() @@ -359,11 +359,11 @@ class StepOneBajajFDFragment : Fragment() { maturityAmountRequest.Frequency = binding.spInterestPayout.text.toString() maturityAmountRequest.Tenure = tenure maturityAmountRequest.Interest = interest - (activity as BajajFdMainActivity).viewModel.getMaturityAmount( + (activity as NiveshFdMainActivity).viewModel.getMaturityAmount( maturityAmountRequest, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getMaturityAmountMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getMaturityAmountMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -385,7 +385,7 @@ class StepOneBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getMaturityAmountResponse.Response.Errors[0].ErrorMessage ) } @@ -396,7 +396,7 @@ class StepOneBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, message ) } @@ -461,12 +461,12 @@ class StepOneBajajFDFragment : Fragment() { } else { getRatesRequest.type = getString(R.string.nonSeniorCitizen) } - (activity as BajajFdMainActivity).viewModel.getRates( + (activity as NiveshFdMainActivity).viewModel.getRates( getRatesRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getRatesMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { val getRatesResponse: GetRatesResponse = @@ -488,7 +488,7 @@ class StepOneBajajFDFragment : Fragment() { binding.ORLayout.visibility = View.VISIBLE val tenureAdapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfTenure ) @@ -511,7 +511,7 @@ class StepOneBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getRatesResponse.Response.Errors[0].ErrorMessage ) } @@ -521,7 +521,7 @@ class StepOneBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt similarity index 88% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt index 614e7b4..4daa7d8 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.fragment +package com.nivesh.production.niveshfd.ui.fragment import android.Manifest import android.annotation.SuppressLint @@ -27,25 +27,25 @@ import androidx.core.content.FileProvider import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.google.gson.Gson -import com.nivesh.production.bajajfd.BuildConfig -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepThreeBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.getFileExtension -import com.nivesh.production.bajajfd.util.Common.Companion.showDialogWithTwoButtons -import com.nivesh.production.bajajfd.util.Constants -import com.nivesh.production.bajajfd.util.ImageUtil -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.BuildConfig +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepThreeBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Common.Companion.getFileExtension +import com.nivesh.production.niveshfd.util.Common.Companion.showDialogWithTwoButtons +import com.nivesh.production.niveshfd.util.Constants +import com.nivesh.production.niveshfd.util.ImageUtil +import com.nivesh.production.niveshfd.util.Resource import java.io.* import java.util.* -class StepThreeBajajFDFragment : Fragment() { +class StepThreeNiveshFDFragment : Fragment() { - private var _binding: FragmentBajajfdStepThreeBinding? = null + private var _binding: FragmentNiveshfdStepThreeBinding? = null private val binding get() = _binding!! private var takeImageResult: ActivityResultLauncher? = null @@ -91,7 +91,7 @@ class StepThreeBajajFDFragment : Fragment() { takeImage() } else { showDialogWithTwoButtons( - (activity as BajajFdMainActivity), getString(R.string.cameraPermission), getString( + (activity as NiveshFdMainActivity), getString(R.string.cameraPermission), getString( R.string.permissionRequired ) ) @@ -105,7 +105,7 @@ class StepThreeBajajFDFragment : Fragment() { selectImageIntent?.launch("image/*") } else { showDialogWithTwoButtons( - (activity as BajajFdMainActivity), getString(R.string.galleryPermission), getString( + (activity as NiveshFdMainActivity), getString(R.string.galleryPermission), getString( R.string.permissionsRequired ) ) @@ -117,7 +117,7 @@ class StepThreeBajajFDFragment : Fragment() { savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepThreeBinding.inflate(inflater, container, false) + _binding = FragmentNiveshfdStepThreeBinding.inflate(inflater, container, false) return binding.root } @@ -167,7 +167,7 @@ class StepThreeBajajFDFragment : Fragment() { } } binding.btnBack.setOnClickListener { - (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 + (activity as NiveshFdMainActivity).binding.viewPager.currentItem = 1 } binding.btnPANUpload.setOnClickListener { @@ -232,7 +232,7 @@ class StepThreeBajajFDFragment : Fragment() { private fun selectImage() { val builder = AlertDialog.Builder( - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) builder.setTitle(getString(R.string.addPhoto)) builder.setItems( @@ -245,7 +245,7 @@ class StepThreeBajajFDFragment : Fragment() { when (pos) { 0 -> { if (hasPermissions( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, Manifest.permission.CAMERA ) ) { @@ -256,7 +256,7 @@ class StepThreeBajajFDFragment : Fragment() { dialog.dismiss() } 1 -> { - if (hasPermissions(activity as BajajFdMainActivity, *permissions)) { + if (hasPermissions(activity as NiveshFdMainActivity, *permissions)) { selectImageIntent?.launch("image/*") } else { requestGalleryPermission.launch(permissions) @@ -287,14 +287,14 @@ class StepThreeBajajFDFragment : Fragment() { private fun onClickRequestPermission() { when { ContextCompat.checkSelfPermission( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, Manifest.permission.CAMERA ) == PackageManager.PERMISSION_GRANTED -> { } ActivityCompat.shouldShowRequestPermissionRationale( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, Manifest.permission.CAMERA ) -> { requestCameraPermission.launch( @@ -461,14 +461,14 @@ class StepThreeBajajFDFragment : Fragment() { du.FDProvider = getString(R.string.bajaj) du.ImageEncodeToBase64 = imageBase64 du.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - du.UniqueId = (activity as BajajFdMainActivity).uniqueId - (activity as BajajFdMainActivity).viewModel.documentsUpload( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + du.UniqueId = (activity as NiveshFdMainActivity).uniqueId + (activity as NiveshFdMainActivity).viewModel.documentsUpload( du, Constants.token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getDocumentUploadMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getDocumentUploadMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -486,13 +486,13 @@ class StepThreeBajajFDFragment : Fragment() { "Documents Uploaded Successfully", Toast.LENGTH_SHORT ).show() - createFDApi((activity as BajajFdMainActivity).createFDRequest) + createFDApi((activity as NiveshFdMainActivity).createFDRequest) } } // 650 -> refreshToken() else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getUploadResponse.Response.Errors[0].ErrorMessage ) } @@ -502,7 +502,7 @@ class StepThreeBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -516,12 +516,12 @@ class StepThreeBajajFDFragment : Fragment() { } private fun createFDApi(data: CreateFDRequest) { - (activity as BajajFdMainActivity).viewModel.createFDApi( + (activity as NiveshFdMainActivity).viewModel.createFDApi( data, Constants.token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe( + (activity as NiveshFdMainActivity).viewModel.getFDResponseMutableData.observe( viewLifecycleOwner ) { response -> when (response) { @@ -535,12 +535,12 @@ class StepThreeBajajFDFragment : Fragment() { createFDApplicationResponse.Response.StatusCode.let { code -> when (code) { 200 -> { - (activity as BajajFdMainActivity).stepThreeApi() + (activity as NiveshFdMainActivity).stepThreeApi() } // 650 -> refreshToken() else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, createFDApplicationResponse.Response.Errors[0].ErrorMessage ) } @@ -550,7 +550,7 @@ class StepThreeBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -569,12 +569,12 @@ class StepThreeBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.docType) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.docTypeApi( + (activity as NiveshFdMainActivity).viewModel.docTypeApi( getCodeRequest, Constants.token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getDocTypeMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getDocTypeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("response", "-->$response") @@ -586,7 +586,7 @@ class StepThreeBajajFDFragment : Fragment() { listOfDocType = getCodeResponse.Response.GetCodesList if (listOfDocType.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfDocType ) @@ -603,7 +603,7 @@ class StepThreeBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Message ) } @@ -613,7 +613,7 @@ class StepThreeBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - Common.showDialogValidation(activity as BajajFdMainActivity, message) + Common.showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -630,25 +630,25 @@ class StepThreeBajajFDFragment : Fragment() { private fun validate(): Boolean { if (panString.isEmpty()) { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getString(R.string.uploadPanDoc) ) return false } else if (photoString.isEmpty()) { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getString(R.string.uploadPhotoDoc) ) return false } else if (docString.isEmpty()) { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, "Upload $docValue Document" ) return false } else if (docValue == "Aadhar" && docString2.isEmpty()) { Common.showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getString(R.string.uploadAadharBackDoc) ) return false diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt similarity index 77% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt index f552c44..1ba7d6f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.ui.fragment +package com.nivesh.production.niveshfd.ui.fragment import android.app.DatePickerDialog import android.app.Dialog @@ -23,33 +23,33 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.textfield.TextInputEditText import com.google.gson.Gson -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.adapter.BankListAdapter -import com.nivesh.production.bajajfd.adapter.PaymentModeAdapter -import com.nivesh.production.bajajfd.adapter.RecommendedBankListAdapter -import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod -import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod -import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod -import com.nivesh.production.bajajfd.util.Common.Companion.getDate -import com.nivesh.production.bajajfd.util.Common.Companion.isIndianMobileNo -import com.nivesh.production.bajajfd.util.Common.Companion.isMinor -import com.nivesh.production.bajajfd.util.Common.Companion.isValidEmail -import com.nivesh.production.bajajfd.util.Common.Companion.isValidName -import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan -import com.nivesh.production.bajajfd.util.Common.Companion.removeError -import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation -import com.nivesh.production.bajajfd.util.Constants.Companion.token -import com.nivesh.production.bajajfd.util.ProgressUtil -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.adapter.BankListAdapter +import com.nivesh.production.niveshfd.adapter.PaymentModeAdapter +import com.nivesh.production.niveshfd.adapter.RecommendedBankListAdapter +import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepTwoBinding +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorAutoCompleteMethod +import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorMethod +import com.nivesh.production.niveshfd.util.Common.Companion.commonSpinnerErrorMethod +import com.nivesh.production.niveshfd.util.Common.Companion.getDate +import com.nivesh.production.niveshfd.util.Common.Companion.isIndianMobileNo +import com.nivesh.production.niveshfd.util.Common.Companion.isMinor +import com.nivesh.production.niveshfd.util.Common.Companion.isValidEmail +import com.nivesh.production.niveshfd.util.Common.Companion.isValidName +import com.nivesh.production.niveshfd.util.Common.Companion.isValidPan +import com.nivesh.production.niveshfd.util.Common.Companion.removeError +import com.nivesh.production.niveshfd.util.Common.Companion.showDialogValidation +import com.nivesh.production.niveshfd.util.Constants.Companion.token +import com.nivesh.production.niveshfd.util.ProgressUtil +import com.nivesh.production.niveshfd.util.Resource import java.util.* -class StepTwoBajajFDFragment : Fragment() { +class StepTwoNiveshFDFragment : Fragment() { - private var _binding: FragmentBajajfdStepTwoBinding? = null + private var _binding: FragmentNiveshfdStepTwoBinding? = null private val binding get() = _binding!! private lateinit var listOfTitle: List @@ -76,7 +76,7 @@ class StepTwoBajajFDFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false) + _binding = FragmentNiveshfdStepTwoBinding.inflate(inflater, container, false) return binding.root } @@ -92,7 +92,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfIFSC = ArrayList() listOfPayMode = ArrayList() stateObject = DataObject() - rbPaymentMode = RadioButton(activity as BajajFdMainActivity) + rbPaymentMode = RadioButton(activity as NiveshFdMainActivity) // Personal Details binding.edtMobileNumber.filters = arrayOf(LengthFilter(10)) @@ -112,11 +112,11 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlMobileNumber) } }) - binding.edtMobileNumber.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.mobile) + binding.edtMobileNumber.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.mobile) binding.edtMobileNumber.setSelection(binding.edtMobileNumber.text.toString().length) // create an OnDateSetListener - if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.isNullOrEmpty()) { - binding.edtDOB.setText(getDate((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.toString())) + if (!(activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.isNullOrEmpty()) { + binding.edtDOB.setText(getDate((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.toString())) } binding.edtDOB.setOnClickListener { removeError(binding.tlDOB) @@ -124,7 +124,7 @@ class StepTwoBajajFDFragment : Fragment() { } - binding.edtPANNumber.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN) + binding.edtPANNumber.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN) binding.edtPANNumber.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) { @@ -183,7 +183,7 @@ class StepTwoBajajFDFragment : Fragment() { }) val splitStringName = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_APPNAME1?.split( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_APPNAME1?.split( "\\s".toRegex() )?.toTypedArray() when (splitStringName?.size) { @@ -217,7 +217,7 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlEmail) } }) - binding.edtEmail.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_EMAIL) + binding.edtEmail.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_EMAIL) binding.spOccupation.setOnItemClickListener { _, _, _, _ -> removeError(binding.tlOccupation) @@ -252,7 +252,7 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlAddressLine1) } }) - binding.edtAddressLine1.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD1) + binding.edtAddressLine1.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD1) binding.edtAddressLine2.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) { @@ -265,7 +265,7 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlAddressLine2) } }) - binding.edtAddressLine2.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD2) + binding.edtAddressLine2.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD2) binding.edtAddressLine3.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) { @@ -278,7 +278,7 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlAddressLine3) } }) - binding.edtAddressLine3.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD3) + binding.edtAddressLine3.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD3) binding.spState.setOnItemClickListener { parent, _, position, _ -> removeError(binding.tlState) @@ -299,7 +299,7 @@ class StepTwoBajajFDFragment : Fragment() { removeError(binding.tlPinCode) } }) - binding.edtPinCode.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PINCODE) + binding.edtPinCode.setText((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PINCODE) // Nominee Details binding.spNomineeTitle.setOnItemClickListener { _, _, _, _ -> @@ -344,7 +344,7 @@ class StepTwoBajajFDFragment : Fragment() { }) val splitNomineeName = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( 0 )?.NomineeName?.split( "\\s".toRegex() @@ -364,13 +364,13 @@ class StepTwoBajajFDFragment : Fragment() { } } - if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( + if (!(activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( 0 )?.NomineeDOB.isNullOrEmpty() ) { binding.edtNomineeDOB.setText( getDate( - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( 0 )?.NomineeDOB.toString() ) @@ -382,7 +382,7 @@ class StepTwoBajajFDFragment : Fragment() { } binding.spNomineeRelation.setText( - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( 0 )?.NomineeRelationship ) @@ -404,7 +404,7 @@ class StepTwoBajajFDFragment : Fragment() { } }) binding.edtGuardianName.setText( - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get( 0 )?.NomineeGuardian ) @@ -517,7 +517,7 @@ class StepTwoBajajFDFragment : Fragment() { .plus(binding.edtMiddleName.text.toString()).plus(" ") .plus(binding.edtLastName.text.toString()), binding.edtMobileNumber.text.toString() - , (activity as BajajFdMainActivity).loginRole) + , (activity as NiveshFdMainActivity).loginRole) } } @@ -525,7 +525,7 @@ class StepTwoBajajFDFragment : Fragment() { apiForEligibleBankList() } - if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!!) { + if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!!) { binding.llBankDetails.visibility = View.VISIBLE } else { binding.llBankDetails.visibility = View.GONE @@ -533,7 +533,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.addBankDetail.setOnClickListener { if (bankListAdapter.itemCount == 5) { - showDialogValidation(activity as BajajFdMainActivity, getString(R.string.fiveAccountValidation)) + showDialogValidation(activity as NiveshFdMainActivity, getString(R.string.fiveAccountValidation)) } else { showHideBankDetail() } @@ -541,8 +541,8 @@ class StepTwoBajajFDFragment : Fragment() { titleApi() setUpRecyclerView( - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist, - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ACCNO1 + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist, + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ACCNO1 ) binding.tvPersonalDetails.setOnClickListener { @@ -570,153 +570,153 @@ class StepTwoBajajFDFragment : Fragment() { binding.btnNext.setOnClickListener { if (validation()) { // Applicant Details - (activity as BajajFdMainActivity).applicantDetails.ApplicantSalutation = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantSalutation = binding.spTitle.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantGender = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantGender = binding.spGender.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantFirstName = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantFirstName = binding.edtFirstName.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantMiddleName = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantMiddleName = binding.edtMiddleName.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantLastName = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantLastName = binding.edtLastName.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantDOB = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantDOB = binding.edtDOB.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantPAN = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantPAN = binding.edtPANNumber.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantMobile = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantMobile = binding.edtMobileNumber.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantOccupation = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantOccupation = binding.spOccupation.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantQualification = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantQualification = binding.edtQualification.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantMaritalStatus = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantMaritalStatus = binding.spMarital.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantEmail = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantEmail = binding.edtEmail.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress1 = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantAddress1 = binding.edtAddressLine1.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress2 = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantAddress2 = binding.edtAddressLine2.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantAddress3 = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantAddress3 = binding.edtAddressLine3.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantCity = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantCity = binding.spCity.text.toString() - (activity as BajajFdMainActivity).applicantDetails.ApplicantState = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantState = stateObject.State_Code - (activity as BajajFdMainActivity).applicantDetails.ApplicantCountry = "India" - (activity as BajajFdMainActivity).applicantDetails.ApplicantPincode = + (activity as NiveshFdMainActivity).applicantDetails.ApplicantCountry = "India" + (activity as NiveshFdMainActivity).applicantDetails.ApplicantPincode = binding.edtPinCode.text.toString().toInt() - (activity as BajajFdMainActivity).applicantDetails.AnnualIncome = + (activity as NiveshFdMainActivity).applicantDetails.AnnualIncome = binding.spIncome.text.toString() // Applicant Relation Details - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelation = "" - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationSalutation = + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantRelation = "" + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantRelationSalutation = "" - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationFirstName = + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantRelationFirstName = "" - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantRelationLastName = + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantRelationLastName = "" - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantMotherFirstName = + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantMotherFirstName = "" - (activity as BajajFdMainActivity).applicantRelationDetails.ApplicantMotherLastName = + (activity as NiveshFdMainActivity).applicantRelationDetails.ApplicantMotherLastName = "" // Applicant Nominee Details - (activity as BajajFdMainActivity).nomineeDetails.NomineeSalutation = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeSalutation = binding.spNomineeTitle.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeGender = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeGender = binding.spGender.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeFirstName = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeFirstName = binding.edtNomineeFirstName.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeMiddleName = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeMiddleName = binding.edtNomineeMiddleName.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeLastName = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeLastName = binding.edtNomineeLastName.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeDOB = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeDOB = binding.edtNomineeDOB.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeRelation = + (activity as NiveshFdMainActivity).nomineeDetails.NomineeRelation = binding.spNomineeRelation.text.toString() - (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress1 = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress2 = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeAddress3 = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeCity = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeState = "" - (activity as BajajFdMainActivity).nomineeDetails.NomineeCountry = "India" - (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0 + (activity as NiveshFdMainActivity).nomineeDetails.NomineeAddress1 = "" + (activity as NiveshFdMainActivity).nomineeDetails.NomineeAddress2 = "" + (activity as NiveshFdMainActivity).nomineeDetails.NomineeAddress3 = "" + (activity as NiveshFdMainActivity).nomineeDetails.NomineeCity = "" + (activity as NiveshFdMainActivity).nomineeDetails.NomineeState = "" + (activity as NiveshFdMainActivity).nomineeDetails.NomineeCountry = "India" + (activity as NiveshFdMainActivity).nomineeDetails.NomineePincode = 0 // Applicant Nominee Guardian Details - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = binding.spGuardianRelation.text.toString() - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianSalutation = binding.spGuardianRelation.text.toString() + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianName = binding.edtGuardianName.text.toString() if (binding.edtGuardianAge.text.toString().isEmpty()) { - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAge = 0 + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianAge = 0 } else { - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAge = + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianAge = binding.edtGuardianAge.text.toString().toInt() } - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCountry = "India" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianCity = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianState = "" + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianCountry = "India" + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianCity = "" + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianState = "" if (binding.edtGuardianPinCode.text.toString().isEmpty()) { - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = 0 + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianPincode = 0 } else { - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianPincode = binding.edtGuardianPinCode.text.toString().toInt() } - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = binding.edtGuardianAddress.text.toString() - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = "" + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" + (activity as NiveshFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = "" // Applicant Bank Details - (activity as BajajFdMainActivity).fdBankDetails.AccountType = + (activity as NiveshFdMainActivity).fdBankDetails.AccountType = bankListAdapter.getSelected()?.AccountType - (activity as BajajFdMainActivity).fdBankDetails.BankBranch = + (activity as NiveshFdMainActivity).fdBankDetails.BankBranch = bankListAdapter.getSelected()?.BranchName - (activity as BajajFdMainActivity).fdBankDetails.IFSCCode = + (activity as NiveshFdMainActivity).fdBankDetails.IFSCCode = bankListAdapter.getSelected()?.IFSCCode - (activity as BajajFdMainActivity).fdBankDetails.AccountNumber = + (activity as NiveshFdMainActivity).fdBankDetails.AccountNumber = bankListAdapter.getSelected()?.AccountNumber - (activity as BajajFdMainActivity).fdBankDetails.BankName = + (activity as NiveshFdMainActivity).fdBankDetails.BankName = bankListAdapter.getSelected()?.BankName - (activity as BajajFdMainActivity).fdBankDetails.PaymentMode = + (activity as NiveshFdMainActivity).fdBankDetails.PaymentMode = rbPaymentMode.text.toString() - (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantDetails = - (activity as BajajFdMainActivity).applicantDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantRelationDetails = - (activity as BajajFdMainActivity).applicantRelationDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.FdBankDetails = - (activity as BajajFdMainActivity).fdBankDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeDetails = - (activity as BajajFdMainActivity).nomineeDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = - (activity as BajajFdMainActivity).nomineeGuardianDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.ApplicantDetails = + (activity as NiveshFdMainActivity).applicantDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.ApplicantRelationDetails = + (activity as NiveshFdMainActivity).applicantRelationDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.FdBankDetails = + (activity as NiveshFdMainActivity).fdBankDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.NomineeDetails = + (activity as NiveshFdMainActivity).nomineeDetails + (activity as NiveshFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = + (activity as NiveshFdMainActivity).nomineeGuardianDetails - (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest = - (activity as BajajFdMainActivity).createFDApplicantRequest + (activity as NiveshFdMainActivity).createFDRequest.CreateFDApplicationRequest = + (activity as NiveshFdMainActivity).createFDApplicantRequest Log.e( "StepTwoResponse", - "-->" + Gson().toJson((activity as BajajFdMainActivity).createFDRequest) + "-->" + Gson().toJson((activity as NiveshFdMainActivity).createFDRequest) ) - createFDApi((activity as BajajFdMainActivity).createFDRequest) + createFDApi((activity as NiveshFdMainActivity).createFDRequest) } } binding.btnBack.setOnClickListener { - (activity as BajajFdMainActivity).binding.viewPager.currentItem = 0 + (activity as NiveshFdMainActivity).binding.viewPager.currentItem = 0 } } private fun createFDApi(data: CreateFDRequest) { - ProgressUtil.showLoading(activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.createFDApi(data, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> + ProgressUtil.showLoading(activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.createFDApi(data, token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getFDResponseMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("createFDApi ", " response -->$response") @@ -728,14 +728,14 @@ class StepTwoBajajFDFragment : Fragment() { createFDApplicationResponse.Response.StatusCode.let { code -> when (code) { 200 -> { - (activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId - (activity as BajajFdMainActivity).stepTwoApi() + (activity as NiveshFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId + (activity as NiveshFdMainActivity).stepTwoApi() } // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, createFDApplicationResponse.Response.Errors[0].ErrorMessage ) } @@ -745,7 +745,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -760,8 +760,8 @@ class StepTwoBajajFDFragment : Fragment() { private fun ifscCodeCheckApi(ifsc: String) { if (ifsc.length >= 10) { - (activity as BajajFdMainActivity).viewModel.ifscCodeApi(ifsc, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.ifscCodeApi(ifsc, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getIfscCodeCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("ifscCodeCheckApi ", " response -->$response") @@ -779,7 +779,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfIFSC = getIFSCCodeListResponse.IFSCCodes if (listOfIFSC.size > 0) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfIFSC ) @@ -798,7 +798,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getIFSCCodeListResponse.Response.message ) } @@ -809,7 +809,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, message ) } @@ -827,11 +827,11 @@ class StepTwoBajajFDFragment : Fragment() { private fun getIFSCDetailsApi(ifscCode: String) { - (activity as BajajFdMainActivity).viewModel.ifscCodeDetailsApi( + (activity as NiveshFdMainActivity).viewModel.ifscCodeDetailsApi( ifscCode, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getIfscCodeDetailsCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getIfscCodeDetailsCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { if (response.data.toString().isNotEmpty()) { @@ -848,7 +848,7 @@ class StepTwoBajajFDFragment : Fragment() { } is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -874,13 +874,13 @@ class StepTwoBajajFDFragment : Fragment() { bankValidationApiRequest.PhoneNo = phoneNumber bankValidationApiRequest.RoleId = loginRole bankValidationApiRequest.BankNo = 1 - ProgressUtil.showLoading(activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.bankValidationApi( + ProgressUtil.showLoading(activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.bankValidationApi( bankValidationApiRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.bankValidationApiMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("verifyAccountNo ", " response -->$response") @@ -905,7 +905,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.edtBankBranch.text.toString() clientBankList.IFSCCode = Ifsc clientBankList.IsValBank = 1 - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.let { + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.let { listOfBanks.addAll( it ) @@ -919,7 +919,7 @@ class StepTwoBajajFDFragment : Fragment() { } else { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getBankValidationApiResponse.Message ) showHideBankDetail() @@ -927,7 +927,7 @@ class StepTwoBajajFDFragment : Fragment() { } else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getBankValidationApiResponse.Message ) showHideBankDetail() @@ -938,7 +938,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -995,7 +995,7 @@ class StepTwoBajajFDFragment : Fragment() { requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics) val width = displayMetrics.widthPixels.toDouble() binding.rvClientBankList.layoutManager = LinearLayoutManager( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, LinearLayoutManager.HORIZONTAL, false ) @@ -1008,7 +1008,7 @@ class StepTwoBajajFDFragment : Fragment() { val month = cal.get(Calendar.MONTH) val day = cal.get(Calendar.DAY_OF_MONTH) val datePickerDialog = DatePickerDialog( - activity as BajajFdMainActivity, { _, years, monthOfYear, dayOfMonth -> + activity as NiveshFdMainActivity, { _, years, monthOfYear, dayOfMonth -> if (monthOfYear.toString().length == 1) { "0".plus(monthOfYear) } @@ -1047,13 +1047,13 @@ class StepTwoBajajFDFragment : Fragment() { private fun panCheckApi() { val panCheck = PanCheckRequest() panCheck.clientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE panCheck.subBrokerCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code panCheck.panNumber = binding.edtPANNumber.text.toString() panCheck.mobileNumber = "" - (activity as BajajFdMainActivity).viewModel.panCheck(panCheck, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.panCheck(panCheck, token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getPanCheckMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("panCheckApi ", " response -->$response") @@ -1071,7 +1071,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tvPANVerify.text = getString(R.string.verifiedText) binding.tvPANVerify.setTextColor( ContextCompat.getColor( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.color.green ) ) @@ -1081,7 +1081,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tvPANVerify.text = getString(R.string.notVerifiedText) binding.tvPANVerify.setTextColor( ContextCompat.getColor( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.color.red ) ) @@ -1092,7 +1092,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1111,8 +1111,8 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.salutationCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.titleApi(getCodeRequest, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.titleApi(getCodeRequest, token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getTitleMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("titleApi ", " response -->$response") @@ -1124,14 +1124,14 @@ class StepTwoBajajFDFragment : Fragment() { listOfTitle = getCodeResponse.Response.GetCodesList if (listOfTitle.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfTitle ) binding.spTitle.setAdapter(adapter) val titleText = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Client_Title + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Client_Title val newTitleText = "$titleText." if (titleText.isNullOrEmpty()) { @@ -1165,7 +1165,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1175,7 +1175,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1194,12 +1194,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.paymentModeCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.paymentModeApi( + (activity as NiveshFdMainActivity).viewModel.paymentModeApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getPaymentModeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("paymentModeApi ", " response -->$response") @@ -1216,7 +1216,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1226,7 +1226,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1242,7 +1242,7 @@ class StepTwoBajajFDFragment : Fragment() { private fun setUpRecyclerViewPaymentMode(listOfPayMode: List) { binding.rvPaymentMode.layoutManager = - GridLayoutManager(activity as BajajFdMainActivity, 2) + GridLayoutManager(activity as NiveshFdMainActivity, 2) paymentModeAdapter = PaymentModeAdapter( listOfPayMode, listOfPayMode[0].Value @@ -1256,12 +1256,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.genderCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.genderApi( + (activity as NiveshFdMainActivity).viewModel.genderApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getGenderMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("genderApi ", " response -->$response") @@ -1273,7 +1273,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfGender = getCodeResponse.Response.GetCodesList if (listOfGender.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfGender ) @@ -1287,7 +1287,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1297,7 +1297,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1316,12 +1316,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.relationshipCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.relationShipApi( + (activity as NiveshFdMainActivity).viewModel.relationShipApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getRelationShipMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("relationShipApi ", " response -->$response") @@ -1333,7 +1333,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfRelationShip = getCodeResponse.Response.GetCodesList if (listOfGender.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfRelationShip ) @@ -1354,7 +1354,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1364,7 +1364,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1384,12 +1384,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.maritalCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.maritalStatusApi( + (activity as NiveshFdMainActivity).viewModel.maritalStatusApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getMaritalStatusMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("maritalStatusApi ", " response -->$response") @@ -1401,7 +1401,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfMaritalStatus = getCodeResponse.Response.GetCodesList if (listOfMaritalStatus.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfMaritalStatus ) @@ -1415,7 +1415,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1425,7 +1425,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1444,12 +1444,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.occupationCategory) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.occupationApi( + (activity as NiveshFdMainActivity).viewModel.occupationApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getOccupationMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("occupationApi ", " response -->$response") @@ -1461,7 +1461,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfOccupation = getCodeResponse.Response.GetCodesList if (listOfOccupation.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfOccupation ) @@ -1475,7 +1475,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1485,7 +1485,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1504,12 +1504,12 @@ class StepTwoBajajFDFragment : Fragment() { getCodeRequest.Category = getString(R.string.annualIncome) getCodeRequest.Language = getString(R.string.language) getCodeRequest.InputValue = "" - (activity as BajajFdMainActivity).viewModel.annualIncomeApi( + (activity as NiveshFdMainActivity).viewModel.annualIncomeApi( getCodeRequest, token, - activity as BajajFdMainActivity + activity as NiveshFdMainActivity ) - (activity as BajajFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.getAnnualIncomeMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("annualIncomeApi ", " response -->$response") @@ -1521,7 +1521,7 @@ class StepTwoBajajFDFragment : Fragment() { listOfAnnualIncome = getCodeResponse.Response.GetCodesList if (listOfAnnualIncome.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfAnnualIncome ) @@ -1535,7 +1535,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getCodeResponse.Response.Errors[0].ErrorMessage ) } @@ -1545,7 +1545,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1559,8 +1559,8 @@ class StepTwoBajajFDFragment : Fragment() { } private fun stateListApi() { - (activity as BajajFdMainActivity).viewModel.stateApi(token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.stateApi(token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getStateMasterMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("stateListApi ", " response -->$response") @@ -1575,13 +1575,13 @@ class StepTwoBajajFDFragment : Fragment() { listOfStates = stateListResponse.DataObject if (listOfStates.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfStates ) binding.spState.setAdapter(adapter) val newTitleText = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_STATE + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_STATE if (newTitleText?.isEmpty()!!) { binding.spState.setText( adapter.getItem(0)?.State_Name, @@ -1607,7 +1607,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, stateListResponse.response.message ) } @@ -1617,7 +1617,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1636,18 +1636,18 @@ class StepTwoBajajFDFragment : Fragment() { cityRequest.StateCode = stateCode cityRequest.Type = "" cityRequest.ClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + cityRequest.RoleID = (activity as NiveshFdMainActivity).loginRole cityRequest.APIName = "" cityRequest.UID = 0 cityRequest.Subbroker_Code = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code cityRequest.RMCode = "" cityRequest.HOCode = "" cityRequest.Source = getString(R.string.source) cityRequest.APP_Web = getString(R.string.app) - (activity as BajajFdMainActivity).viewModel.cityListApi(cityRequest, token, activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getCityListMutableData.observe(viewLifecycleOwner) { response -> + (activity as NiveshFdMainActivity).viewModel.cityListApi(cityRequest, token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getCityListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("cityListApi ", " response -->$response") @@ -1659,14 +1659,14 @@ class StepTwoBajajFDFragment : Fragment() { listOfCities = cityListResponse.DataObject if (listOfCities.isNotEmpty()) { val adapter = ArrayAdapter( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, R.layout.spinner_dropdown, listOfCities ) binding.spCity.setAdapter(adapter) val newTitleText = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CITY + (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CITY if (newTitleText?.isEmpty()!!) { binding.spCity.setText( adapter.getItem(0)?.city_name, @@ -1685,7 +1685,7 @@ class StepTwoBajajFDFragment : Fragment() { // 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, cityListResponse.response.message ) } @@ -1695,7 +1695,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1709,9 +1709,9 @@ class StepTwoBajajFDFragment : Fragment() { } private fun apiForEligibleBankList() { - ProgressUtil.showLoading(activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity) - (activity as BajajFdMainActivity).viewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> + ProgressUtil.showLoading(activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.bankListApi(token,getString(R.string.language), activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { Log.e("apiForEligibleBankList ", " response -->$response") @@ -1730,7 +1730,7 @@ class StepTwoBajajFDFragment : Fragment() { 650 -> refreshToken() else -> { showDialogValidation( - activity as BajajFdMainActivity, + activity as NiveshFdMainActivity, getFDBankListResponse.Response.Errors[0].ErrorMessage ) } @@ -1740,7 +1740,7 @@ class StepTwoBajajFDFragment : Fragment() { is Resource.Error -> { response.message?.let { message -> - showDialogValidation(activity as BajajFdMainActivity, message) + showDialogValidation(activity as NiveshFdMainActivity, message) } } is Resource.Loading -> { @@ -1758,7 +1758,7 @@ class StepTwoBajajFDFragment : Fragment() { } private fun dialogForBankList(bankList: List) { - val dialog = Dialog(activity as BajajFdMainActivity) + val dialog = Dialog(activity as NiveshFdMainActivity) dialog.setContentView(R.layout.layout_bank_list) dialog.setCancelable(true) dialog.window!! @@ -1767,7 +1767,7 @@ class StepTwoBajajFDFragment : Fragment() { WindowManager.LayoutParams.MATCH_PARENT ) val rvClientList = dialog.findViewById(R.id.rvBankList) - rvClientList.layoutManager = LinearLayoutManager(activity as BajajFdMainActivity) + rvClientList.layoutManager = LinearLayoutManager(activity as NiveshFdMainActivity) val tvCancel = dialog.findViewById(R.id.tvCancel) tvCancel.setOnClickListener { dialog.dismiss() @@ -1940,7 +1940,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tlGuardianName, getString(R.string.validGuardianDetails) ) - } else if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtIFSC.text.toString() + } else if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtIFSC.text.toString() .isEmpty() ) { // EditText commonErrorAutoCompleteMethod( @@ -1948,7 +1948,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tlIFSC, getString(R.string.emptyIFSCCode) ) - } else if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtIFSC.text.toString() + } else if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtIFSC.text.toString() .length != 11 ) { // EditText commonErrorAutoCompleteMethod( @@ -1956,7 +1956,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tlIFSC, getString(R.string.validIFSCCode) ) - } else if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtAccountNumber.text.toString() + } else if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtAccountNumber.text.toString() .isEmpty() ) { // EditText commonErrorMethod( @@ -1964,7 +1964,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tlAccountNumber, getString(R.string.emptyAccNo) ) - } else if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtBankName.text.toString() + } else if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtBankName.text.toString() .isEmpty() ) { // EditText commonErrorMethod( @@ -1972,7 +1972,7 @@ class StepTwoBajajFDFragment : Fragment() { binding.tlBankName, getString(R.string.emptyBankName) ) - } else if ((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtBankBranch.text.toString() + } else if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.ClientBanklist?.isEmpty()!! && binding.edtBankBranch.text.toString() .isEmpty() ) { // EditText commonErrorMethod( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/providerfactory/FDModelProviderFactory.kt similarity index 62% rename from app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt rename to app/src/main/java/com/nivesh/production/niveshfd/ui/providerfactory/FDModelProviderFactory.kt index 3f68938..de3b853 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/providerfactory/FDModelProviderFactory.kt @@ -1,9 +1,9 @@ -package com.nivesh.production.bajajfd.ui.providerfactory +package com.nivesh.production.niveshfd.ui.providerfactory import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel +import com.nivesh.production.niveshfd.repositories.MainRepository +import com.nivesh.production.niveshfd.viewModel.BajajFDViewModel class FDModelProviderFactory(private val mainRepository: MainRepository) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Colors.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/Colors.kt similarity index 58% rename from app/src/main/java/com/nivesh/production/bajajfd/util/Colors.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/Colors.kt index 168a28a..3ae1625 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Colors.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/Colors.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util object Colors { const val colorDefault: String = "#17A31D" diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/Common.kt similarity index 95% rename from app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/Common.kt index 09aef07..4754f9e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/Common.kt @@ -1,11 +1,9 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util -import android.Manifest import android.app.Activity import android.app.AlertDialog import android.content.Context import android.content.Intent -import android.content.pm.PackageManager import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.net.ConnectivityManager @@ -16,16 +14,12 @@ import android.provider.Settings import android.text.format.DateFormat import android.util.Log import android.util.Patterns -import androidx.activity.result.contract.ActivityResultContracts -import androidx.core.app.ActivityCompat -import androidx.core.content.ContextCompat -import androidx.core.content.ContextCompat.startActivity import com.google.android.material.textfield.MaterialAutoCompleteTextView import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.R -import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity +import com.nivesh.production.niveshfd.R +import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity import kotlinx.coroutines.CoroutineExceptionHandler import org.json.JSONObject import retrofit2.HttpException @@ -137,7 +131,7 @@ class Common { builder.setPositiveButton(activity.getString(R.string.Ok)) { dialogInterface, _ -> val intent = Intent( Settings.ACTION_APPLICATION_DETAILS_SETTINGS, - Uri.fromParts("package", (activity as BajajFdMainActivity).packageName, null) + Uri.fromParts("package", (activity as NiveshFdMainActivity).packageName, null) ) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) activity.startActivity(intent) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt similarity index 80% rename from app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt index ed5ae6e..a22448f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util class Constants() { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/ImageUtil.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/ImageUtil.kt similarity index 94% rename from app/src/main/java/com/nivesh/production/bajajfd/util/ImageUtil.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/ImageUtil.kt index 0d1340f..6326dae 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/ImageUtil.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/ImageUtil.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/ProgressUtil.kt similarity index 97% rename from app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/ProgressUtil.kt index c6db944..2d99c26 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/ProgressUtil.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util import android.annotation.SuppressLint import android.app.AlertDialog diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/Resource.kt similarity index 90% rename from app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt rename to app/src/main/java/com/nivesh/production/niveshfd/util/Resource.kt index 69fe7d9..09c85aa 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Resource.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/util/Resource.kt @@ -1,4 +1,4 @@ -package com.nivesh.production.bajajfd.util +package com.nivesh.production.niveshfd.util sealed class Resource( val data: T? = null, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/niveshfd/viewModel/BajajFDViewModel.kt similarity index 97% rename from app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt rename to app/src/main/java/com/nivesh/production/niveshfd/viewModel/BajajFDViewModel.kt index c323cb7..94d9eb1 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/viewModel/BajajFDViewModel.kt @@ -1,17 +1,17 @@ -package com.nivesh.production.bajajfd.viewModel +package com.nivesh.production.niveshfd.viewModel import android.app.Activity import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.* -import com.nivesh.production.bajajfd.repositories.MainRepository -import com.nivesh.production.bajajfd.util.Common -import com.nivesh.production.bajajfd.util.Common.Companion.handleError -import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse -import com.nivesh.production.bajajfd.util.Constants -import com.nivesh.production.bajajfd.util.Resource +import com.nivesh.production.niveshfd.model.* +import com.nivesh.production.niveshfd.repositories.MainRepository +import com.nivesh.production.niveshfd.util.Common +import com.nivesh.production.niveshfd.util.Common.Companion.handleError +import com.nivesh.production.niveshfd.util.Common.Companion.handleResponse +import com.nivesh.production.niveshfd.util.Constants +import com.nivesh.production.niveshfd.util.Resource import kotlinx.coroutines.launch open class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { diff --git a/app/src/main/res/layout/activity_bajaj_fd.xml b/app/src/main/res/layout/activity_nivesh_fd.xml similarity index 96% rename from app/src/main/res/layout/activity_bajaj_fd.xml rename to app/src/main/res/layout/activity_nivesh_fd.xml index c890513..e87a21f 100644 --- a/app/src/main/res/layout/activity_bajaj_fd.xml +++ b/app/src/main/res/layout/activity_nivesh_fd.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.activity.BajajFdMainActivity"> + tools:context="com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity"> - + tools:context="com.nivesh.production.niveshfd.ui.fragment.StepFiveNiveshFDFragment"> + tools:context="com.nivesh.production.niveshfd.ui.fragment.StepFourNiveshFDFragment"> + tool:context="com.nivesh.production.niveshfd.ui.fragment.StepOneNiveshFDFragment"> + tools:context=".ui.fragment.StepFourNiveshFDFragment"> + tools:context=".ui.fragment.StepThreeNiveshFDFragment">