From 24046cd911cf273a842748846cbac2810f7f938a Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Mon, 9 Jan 2023 19:45:51 +0530 Subject: [PATCH 1/4] modified stepfive --- .../bajajfd/adapter/SectionsPagerAdapter.kt | 4 +- .../ui/activity/BajajFdMainActivity.kt | 43 +++++++---- .../ui/fragment/StepFiveBajajFDFragment.kt | 33 ++++++-- .../ui/fragment/StepFourBajajFDFragment.kt | 70 ++++++++++------- app/src/main/res/layout/activity_bajaj_fd.xml | 75 ++++++++++--------- .../res/layout/fragment_bajajfd_step_five.xml | 8 +- app/src/main/res/values-hi-rIN/strings.xml | 3 +- app/src/main/res/values/strings.xml | 3 +- 8 files changed, 145 insertions(+), 94 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt index 6584a29..b795476 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/SectionsPagerAdapter.kt @@ -5,13 +5,13 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array, private val NumberOfTabs: Int) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { +class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { private val titles = ArrayList() override fun getItem(position: Int): Fragment = fragments[position] - override fun getCount(): Int = NumberOfTabs + override fun getCount(): Int = fragments.size override fun getPageTitle(position: Int): CharSequence = titles[position] diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 29cf5dd..261d2e2 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -6,6 +6,7 @@ import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.os.Bundle import android.util.Log +import android.view.View import android.view.WindowManager import android.webkit.WebView import android.webkit.WebViewClient @@ -53,7 +54,7 @@ class BajajFdMainActivity : BaseActivity() { var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails() var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse() var uniqueId: String = "" - private var stepCount: Int = 0 + var stepCount: Int = 0 private lateinit var sectionsPagerAdapter: SectionsPagerAdapter private lateinit var fragments: Array var dialogWebView: Dialog? = null @@ -104,6 +105,9 @@ class BajajFdMainActivity : BaseActivity() { when (code) { 200 -> { stepCount = stepsCountResponse.Response.StepsCount + if (stepCount == 3) { + binding.llStep4.visibility = View.GONE + } getClientDetailsApi(stepsCountResponse.Response.StepsCount) } 650 -> "" @@ -199,7 +203,7 @@ class BajajFdMainActivity : BaseActivity() { private fun setViewPager(stepsCount: Int) { // steps setting - setBackground(selectedShape(), defaultShape(), defaultShape(), defaultShape()) + setBackground(selectedShape(), defaultShape(), defaultShape(), defaultShape(), stepsCount) if (stepCount == 3) { fragments = arrayOf( @@ -219,15 +223,15 @@ class BajajFdMainActivity : BaseActivity() { } // set viewPager - sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount) + sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments) val viewPager: DisableAdapter = binding.viewPager viewPager.adapter = sectionsPagerAdapter viewPager.setPagingEnabled(false) - // if (sectionsPagerAdapter.count > 1) { - viewPager.offscreenPageLimit = stepCount - 1 - // } else { - // viewPager.offscreenPageLimit = 1 - // } + if (sectionsPagerAdapter.count > 1) { + viewPager.offscreenPageLimit = stepCount + } else { + viewPager.offscreenPageLimit = 1 + } viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, @@ -243,7 +247,8 @@ class BajajFdMainActivity : BaseActivity() { defaultShape(), defaultShape(), defaultShape(), - defaultShape() + defaultShape(), + stepsCount ) } 1 -> { @@ -251,7 +256,8 @@ class BajajFdMainActivity : BaseActivity() { selectedShape(), defaultShape(), defaultShape(), - defaultShape() + defaultShape(), + stepsCount ) } 2 -> { @@ -259,7 +265,8 @@ class BajajFdMainActivity : BaseActivity() { selectedShape(), selectedShape(), defaultShape(), - defaultShape() + defaultShape(), + stepsCount ) } 3 -> { @@ -267,7 +274,8 @@ class BajajFdMainActivity : BaseActivity() { selectedShape(), selectedShape(), selectedShape(), - defaultShape() + defaultShape(), + stepsCount ) } 4 -> { @@ -275,7 +283,8 @@ class BajajFdMainActivity : BaseActivity() { selectedShape(), selectedShape(), selectedShape(), - selectedShape() + selectedShape(), + stepsCount ) } } @@ -350,12 +359,16 @@ class BajajFdMainActivity : BaseActivity() { drawable: Drawable?, drawable1: Drawable?, drawable2: Drawable?, - drawable3: Drawable? + drawable3: Drawable?, + stepsCount: Int ) { binding.stepOne.background = drawable binding.stepTwo.background = drawable1 binding.stepThree.background = drawable2 - binding.stepFour.background = drawable3 + if (stepsCount == 4) { + binding.stepFour.background = drawable3 + } + } // step 1 response diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt index bd77401..4bec0fb 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt @@ -4,10 +4,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding import com.nivesh.production.bajajfd.model.PaymentReQueryResponse +import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity class StepFiveBajajFDFragment : Fragment() { @@ -18,19 +20,36 @@ class StepFiveBajajFDFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - binding.apply { - _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false) - } + + _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false) return binding.root } fun getData(paymentReQueryResponse: PaymentReQueryResponse) { if (paymentReQueryResponse.Response.StatusCode == 200) { - binding.tvCongrats.text = getString(R.string.congratulations) - binding.tvSuccessMessage.text = paymentReQueryResponse.Response.Message + if (paymentReQueryResponse.Response.Message.isNotEmpty()) { + val arrOfStr: List = paymentReQueryResponse.Response.Message.split(" ", limit = 2) + binding.tvCongrats.text = arrOfStr[0] + binding.tvCongrats.setTextColor( + ContextCompat.getColor( + activity as BajajFdMainActivity, + R.color.green + ) + ) + binding.tvSuccessMessage.text = arrOfStr[1] + } }else{ - binding.tvCongrats.text = getString(R.string.sorry) - binding.tvSuccessMessage.text = paymentReQueryResponse.Response.Message + if (paymentReQueryResponse.Response.Message.isNotEmpty()) { + val arrOfStr: List = paymentReQueryResponse.Response.Message.split(" ", limit = 2) + binding.tvCongrats.text = arrOfStr[0] + binding.tvCongrats.setTextColor( + ContextCompat.getColor( + activity as BajajFdMainActivity, + R.color.red + ) + ) + binding.tvSuccessMessage.text = arrOfStr[1] + } } } 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 af72da5..a6678c8 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 @@ -62,39 +62,55 @@ class StepFourBajajFDFragment : Fragment() { } binding.btnNext.setOnClickListener { - if ((activity as BajajFdMainActivity).loginRole == 5) { - selectedList = "" - for (getCodes in listOfCustomer) { - if (getCodes.isSelected) { - selectedList = if (selectedList.isEmpty()) { - getCodes.Value - } else { - selectedList.plus(",").plus(getCodes.Value) - } + selectedList = "" + for (getCodes in listOfCustomer) { + if (getCodes.isSelected) { + selectedList = if (selectedList.isEmpty()) { + getCodes.Value + } else { + selectedList.plus(",").plus(getCodes.Value) } } - if (binding.checkBox.isChecked && selectedList.isNotEmpty()) { - val saveFDOtherDataRequest = SaveFDOtherDataRequest() - saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) - saveFDOtherDataRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId - saveFDOtherDataRequest.Values = selectedList - saveFDOtherDataRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - // bajajFDInterface.stepFourApi(saveFDOtherDataRequest, payUrl, Value) - saveFDOtherData(saveFDOtherDataRequest, payUrl, value) - } else { - showDialogValidation( - activity as BajajFdMainActivity, - resources.getString(R.string.validTermsConditions) - ) - } - } else { - // go to view order } + if (validated()) { + if ((activity as BajajFdMainActivity).loginRole == 5) { + val saveFDOtherDataRequest = SaveFDOtherDataRequest() + saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) + saveFDOtherDataRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId + saveFDOtherDataRequest.Values = selectedList + saveFDOtherDataRequest.NiveshClientCode = + (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + saveFDOtherData(saveFDOtherDataRequest, payUrl, value) + } else { + // go to view order + } + } } binding.btnBack.setOnClickListener { - (activity as BajajFdMainActivity).binding.viewPager.currentItem = 2 + if ((activity as BajajFdMainActivity).stepCount == 4) { + (activity as BajajFdMainActivity).binding.viewPager.currentItem = 2 + } else { + (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 + } + } + } + + private fun validated(): Boolean { + if (selectedList.isEmpty()) { + showDialogValidation( + activity as BajajFdMainActivity, + getString(R.string.validTermsCondition) + ) + return false + } else if (!binding.checkBox.isChecked) { + showDialogValidation( + activity as BajajFdMainActivity, + resources.getString(R.string.validTermsConditions) + ) + return false + } else { + return true } } diff --git a/app/src/main/res/layout/activity_bajaj_fd.xml b/app/src/main/res/layout/activity_bajaj_fd.xml index fbfbeaa..c890513 100644 --- a/app/src/main/res/layout/activity_bajaj_fd.xml +++ b/app/src/main/res/layout/activity_bajaj_fd.xml @@ -12,33 +12,33 @@ android:background="@color/white"> + android:layout_height="wrap_content" + android:background="@color/red" + android:orientation="horizontal"> + android:gravity="center" + android:padding="@dimen/margin_10" + android:src="@drawable/svg_back" /> + android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" + android:textColor="@color/white" + android:textSize="@dimen/text_size_14" /> @@ -47,9 +47,9 @@ android:id="@+id/llSteps" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/greyColor4" android:gravity="center" android:orientation="horizontal" - android:background="@color/greyColor4" android:paddingTop="@dimen/margin_10" android:paddingBottom="@dimen/margin_10"> @@ -112,36 +112,43 @@ android:textColor="@color/black" android:textSize="@dimen/text_size_12" /> - - - - - + android:orientation="horizontal"> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bajajfd_step_five.xml b/app/src/main/res/layout/fragment_bajajfd_step_five.xml index e8017e7..9acdd82 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_five.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml @@ -85,26 +85,24 @@ style="@style/semiBoldStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/margin_12" android:textColor="@color/black" android:textSize="@dimen/text_size_17" android:text="" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.437" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 96dd577..5184113 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -225,11 +225,9 @@ View Order - Congratulations Your transaction is successful. You will receive fixed deposit certificate\nwithin 3 working days on email Download Invoice - Sorry! Your transaction is unsuccessful. Sorry for the inconvenience please try again later Retry @@ -252,6 +250,7 @@ You Need to Give Permission of Gallery for uploading Image Permission Required ! Permission\'s Required ! + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 96dd577..5184113 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -225,11 +225,9 @@ View Order - Congratulations Your transaction is successful. You will receive fixed deposit certificate\nwithin 3 working days on email Download Invoice - Sorry! Your transaction is unsuccessful. Sorry for the inconvenience please try again later Retry @@ -252,6 +250,7 @@ You Need to Give Permission of Gallery for uploading Image Permission Required ! Permission\'s Required ! + \ No newline at end of file From 824af7e316f84acbae5fd00472564a0757343e6c Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Mon, 9 Jan 2023 20:08:19 +0530 Subject: [PATCH 2/4] added prograss dialog --- app/src/main/AndroidManifest.xml | 2 +- .../ui/activity/BajajFdMainActivity.kt | 9 +++- .../ui/fragment/StepFourBajajFDFragment.kt | 7 ++- .../ui/fragment/StepTwoBajajFDFragment.kt | 11 ++-- .../production/bajajfd/util/ProgressUtil.kt | 50 +++++++++++++++++++ app/src/main/res/values-hi-rIN/strings.xml | 2 +- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- settings.gradle | 2 +- 10 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/util/ProgressUtil.kt 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 @@ -