diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 245ae96..8bcec28 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ android:label="@string/appName" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.NiveshSDK" + android:theme="@style/Theme.NiveshFDSDK" tools:targetApi="31"> " + Gson().toJson(getClientDetailsRequest)) + showLoading(this@BajajFdMainActivity) viewModel.getClientDetails(getClientDetailsRequest, token, this) viewModel.getClientDetailsMutableData.observe(this) { response -> when (response) { @@ -191,7 +195,7 @@ class BajajFdMainActivity : BaseActivity() { } } is Resource.Loading -> { - + hideLoading() } is Resource.DataError -> { @@ -441,6 +445,7 @@ class BajajFdMainActivity : BaseActivity() { paymentReQueryRequest.UniqueId = uniqueId paymentReQueryRequest.NiveshClientCode = getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + ProgressUtil.showLoading(this@BajajFdMainActivity) viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) viewModel.getPaymentReQueryMutableData.observe(this) { response -> when (response) { @@ -471,7 +476,7 @@ class BajajFdMainActivity : BaseActivity() { } } is Resource.Loading -> { - + hideLoading() } is Resource.DataError -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index a6678c8..8918585 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -17,6 +17,7 @@ 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 class StepFourBajajFDFragment : Fragment() { @@ -115,6 +116,7 @@ class StepFourBajajFDFragment : Fragment() { } private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) { + ProgressUtil.showLoading(activity as BajajFdMainActivity) (activity as BajajFdMainActivity).viewModel.saveFDOtherData( data, token, @@ -151,7 +153,7 @@ class StepFourBajajFDFragment : Fragment() { } } is Resource.Loading -> { - + ProgressUtil.hideLoading() } is Resource.DataError -> { @@ -233,6 +235,7 @@ class StepFourBajajFDFragment : Fragment() { 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( getFDDetailsRequest, token, @@ -282,7 +285,7 @@ class StepFourBajajFDFragment : Fragment() { } } is Resource.Loading -> { - + ProgressUtil.hideLoading() } is Resource.DataError -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index fd2dfd1..f552c44 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -42,6 +42,7 @@ 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 java.util.* @@ -713,6 +714,7 @@ class StepTwoBajajFDFragment : Fragment() { } 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 -> when (response) { @@ -747,7 +749,7 @@ class StepTwoBajajFDFragment : Fragment() { } } is Resource.Loading -> { - + ProgressUtil.hideLoading() } is Resource.DataError -> { @@ -872,6 +874,7 @@ class StepTwoBajajFDFragment : Fragment() { bankValidationApiRequest.PhoneNo = phoneNumber bankValidationApiRequest.RoleId = loginRole bankValidationApiRequest.BankNo = 1 + ProgressUtil.showLoading(activity as BajajFdMainActivity) (activity as BajajFdMainActivity).viewModel.bankValidationApi( bankValidationApiRequest, token, @@ -939,7 +942,7 @@ class StepTwoBajajFDFragment : Fragment() { } } is Resource.Loading -> { - + ProgressUtil.hideLoading() } is Resource.DataError -> { @@ -1706,6 +1709,7 @@ 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 -> when (response) { @@ -1740,7 +1744,7 @@ class StepTwoBajajFDFragment : Fragment() { } } is Resource.Loading -> { - + ProgressUtil.hideLoading() } is Resource.DataError -> { @@ -1751,7 +1755,6 @@ class StepTwoBajajFDFragment : Fragment() { private fun refreshToken() { - } private fun dialogForBankList(bankList: List) { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt new file mode 100644 index 0000000..c6db944 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt @@ -0,0 +1,50 @@ +package com.nivesh.production.bajajfd.util + +import android.annotation.SuppressLint +import android.app.AlertDialog +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.util.Log +import android.view.Window +import android.widget.ProgressBar + +@SuppressLint("StaticFieldLeak") +object ProgressUtil{ + + private lateinit var dialogBuilder: AlertDialog.Builder + private lateinit var alertDialog: AlertDialog + private lateinit var pDialog: ProgressBar + + + fun showLoading(ctx: Context){ + // instantiating the lateInit objects + dialogBuilder= AlertDialog.Builder(ctx) + pDialog= ProgressBar(ctx) + + // setting up the dialog + dialogBuilder.setCancelable(false) + dialogBuilder.setView(pDialog) + alertDialog=dialogBuilder.create() + + // magic of transparent background goes here + alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE) + // setting the alertDialog's BackgroundDrawable as the color resource of any color with 1% opacity + alertDialog.window?.setBackgroundDrawable(ColorDrawable(Color.parseColor("#00141414"))) + + // finally displaying the Alertdialog containing the ProgressBar + alertDialog.show() + + } + + + fun hideLoading(){ + try { + if(alertDialog.isShowing){ + alertDialog.dismiss() + } + } catch (e: UninitializedPropertyAccessException) { + Log.e("TAG","AlertDialog UninitializedPropertyAccessException") + } + } +} \ No newline at end of file diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 5184113..02fa1f2 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -1,5 +1,5 @@ - NiveshSDK + NiveshFDSDK Bajaj App nivesh diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index e5a7f0c..103d5f1 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ -