modified stepfive

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<Fragment>, private val NumberOfTabs: Int) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+class SectionsPagerAdapter(manager: FragmentManager,private val fragments: Array<Fragment>) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     private val titles = ArrayList<String>()
 
     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]
 

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<Fragment>
     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

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<String> = 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<String> = 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]
+            }
         }
     }
 

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
         }
     }
 

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

@@ -12,33 +12,33 @@
         android:background="@color/white">
 
         <LinearLayout
-            android:orientation="horizontal"
-            android:background="@color/red"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="@color/red"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/imgBack"
-                android:layout_marginStart="@dimen/margin_15"
-                android:layout_marginEnd="@dimen/margin_15"
-                android:padding="@dimen/margin_10"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/svg_back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/margin_15"
+                android:layout_marginEnd="@dimen/margin_15"
                 android:contentDescription="@string/back"
-                android:gravity="center" />
+                android:gravity="center"
+                android:padding="@dimen/margin_10"
+                android:src="@drawable/svg_back" />
 
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_14"
                 android:minHeight="?actionBarSize"
                 android:padding="@dimen/margin_16"
                 android:text="@string/fd"
-                android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" />
+                android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_14" />
 
 
         </LinearLayout>
@@ -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" />
 
-            <View
-                android:layout_width="@dimen/margin_22"
-                android:layout_height="@dimen/margin_2"
-                android:layout_marginStart="@dimen/margin_5"
-                android:layout_marginEnd="@dimen/margin_5"
-                android:background="@color/green" />
-
-            <ImageView
-                android:id="@+id/stepFour"
-                android:layout_width="@dimen/margin_19"
-                android:layout_height="@dimen/margin_19"
-                android:contentDescription="@string/step4"
-                android:gravity="center" />
-
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/llStep4"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_3"
-                android:text="@string/step4"
-                android:textColor="@color/black"
-                android:textSize="@dimen/text_size_12" />
+                android:orientation="horizontal">
+
+                <View
+                    android:layout_width="@dimen/margin_22"
+                    android:layout_height="@dimen/margin_2"
+                    android:layout_marginStart="@dimen/margin_5"
+                    android:layout_marginEnd="@dimen/margin_5"
+                    android:background="@color/green" />
+
+                <ImageView
+                    android:id="@+id/stepFour"
+                    android:layout_width="@dimen/margin_19"
+                    android:layout_height="@dimen/margin_19"
+                    android:contentDescription="@string/step4"
+                    android:gravity="center" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_3"
+                    android:text="@string/step4"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_12" />
+            </LinearLayout>
 
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <com.nivesh.production.bajajfd.adapter.DisableAdapter
         android:id="@+id/viewPager"
-        android:contentDescription="@string/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:contentDescription="@string/viewpager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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" />
 
                         <TextView
                             android:id="@+id/tvSuccessMessage"
                             style="@style/regularStyle"
+                            android:gravity="center"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/margin_15"
                             android:textColor="@color/black"
                             android:textSize="@dimen/text_size_16"
-                            android:text=""
                             app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.419"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvCongrats" />
 

app/src/main/res/values-hi-rIN/strings.xml

@@ -225,11 +225,9 @@
 
     <!-- Step Five   -->
     <string name="viewOrder">View Order</string>
-    <string name="congratulations">Congratulations</string>
     <string name="transactionIsSuccessful">Your transaction is successful.</string>
     <string name="certificateOnEmail">You will receive fixed deposit certificate\nwithin 3 working days on email</string>
     <string name="downloadInvoice">Download Invoice</string>
-    <string name="sorry">Sorry!</string>
     <string name="TransactionIsUnsuccessful">Your transaction is unsuccessful.</string>
     <string name="tryAgainLater">Sorry for the inconvenience please try again later</string>
     <string name="retry">Retry</string>
@@ -252,6 +250,7 @@
     <string name="galleryPermission">You Need to Give Permission of Gallery for uploading Image</string>
     <string name="permissionRequired">Permission Required !</string>
     <string name="permissionsRequired">Permission\'s Required !</string>
+    <string name="validTermsCondition"><![CDATA[Please select at least one Term & Condition.]]></string>
 
 
 </resources>

app/src/main/res/values/strings.xml

@@ -225,11 +225,9 @@
 
     <!-- Step Five   -->
     <string name="viewOrder">View Order</string>
-    <string name="congratulations">Congratulations</string>
     <string name="transactionIsSuccessful">Your transaction is successful.</string>
     <string name="certificateOnEmail">You will receive fixed deposit certificate\nwithin 3 working days on email</string>
     <string name="downloadInvoice">Download Invoice</string>
-    <string name="sorry">Sorry!</string>
     <string name="TransactionIsUnsuccessful">Your transaction is unsuccessful.</string>
     <string name="tryAgainLater">Sorry for the inconvenience please try again later</string>
     <string name="retry">Retry</string>
@@ -252,6 +250,7 @@
     <string name="galleryPermission">You Need to Give Permission of Gallery for uploading Image</string>
     <string name="permissionRequired">Permission Required !</string>
     <string name="permissionsRequired">Permission\'s Required !</string>
+    <string name="validTermsCondition"><![CDATA[Please select at least one Term & Condition.]]></string>
 
 
 </resources>