diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt index e8c9da7..7669042 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt @@ -73,8 +73,7 @@ class ViewPagerActivity : BaseActivity() { }) binding.tvSkip.setOnClickListener { - intent = Intent(this@ViewPagerActivity, LoginActivity::class.java) - startActivity(intent) + stepFourApi() } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/BaseFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/BaseFragment.kt new file mode 100644 index 0000000..e68d2e1 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/BaseFragment.kt @@ -0,0 +1,47 @@ +package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1 + +import android.app.Activity +import android.content.Context +import androidx.fragment.app.Fragment +import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity + +open class BaseFragment : Fragment() { + + private lateinit var mActivity: Activity + override fun onAttach(context: Context) { + super.onAttach(context) + mActivity = context as BaseActivity + } + + companion object { + fun addFragment( + activity: BaseActivity, + containerViewId: Int, + fragment: Fragment, + tag: String, + addToBackStack: Boolean + ) { + val fragmentTransaction = activity.supportFragmentManager.beginTransaction() + fragmentTransaction.add(containerViewId, fragment, tag) + if (addToBackStack) { + fragmentTransaction.addToBackStack(tag) + } + fragmentTransaction.commit() + } + + fun replaceFragment( + activity: BaseActivity, + containerViewId: Int, + fragment: Fragment, + tag: String, + addToBackStack: Boolean + ) { + val fragmentTransaction = activity.supportFragmentManager.beginTransaction() + fragmentTransaction.replace(containerViewId, fragment, tag) + if (addToBackStack) { + fragmentTransaction.addToBackStack(tag) + } + fragmentTransaction.commit() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt index 6c7b5da..e3d34ba 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt @@ -2,19 +2,22 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1 import android.os.Bundle import android.text.Editable +import android.text.InputFilter import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.fragment.app.Fragment import com.nivesh.production.niveshfd.R import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding +import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity import com.nivesh.production.niveshfd.fd.util.Common -class SignUpFragment : Fragment() { + +class SignUpFragment : BaseFragment() { private var _binding: FragmentSignupBinding? = null private val binding get() = _binding!! + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { @@ -28,6 +31,7 @@ class SignUpFragment : Fragment() { } private fun init() { + binding.edtMobileNumber.filters = arrayOf(InputFilter.LengthFilter(10)) binding.edtMobileNumber.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} @@ -38,19 +42,26 @@ class SignUpFragment : Fragment() { binding.btnSignUp.setOnClickListener { if (validate()) { - + replaceFragment( + activity as BaseActivity, + com.nivesh.production.niveshfd.R.id.signUpContainer, + OTPFragment(), + "OTP", + true + ) } } } + private fun validate(): Boolean { return if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText Common.commonErrorMethod( binding.edtMobileNumber, binding.tlMobileNumber, - getString(R.string.emptyMobileNumber) + getString(com.nivesh.production.niveshfd.R.string.emptyMobileNumber) ) - } else if (!Common.isIndianMobileNo(binding.edtMobileNumber.text.toString())) { // EditText + } else if (binding.edtMobileNumber.text?.length != 10) { // EditText Common.commonErrorMethod( binding.edtMobileNumber, binding.tlMobileNumber, diff --git a/app/src/main/res/drawable/signup.png b/app/src/main/res/drawable/signup.png new file mode 100644 index 0000000..863343c Binary files /dev/null and b/app/src/main/res/drawable/signup.png differ diff --git a/app/src/main/res/layout/fragment_signup.xml b/app/src/main/res/layout/fragment_signup.xml index 6359d6c..52bfb78 100644 --- a/app/src/main/res/layout/fragment_signup.xml +++ b/app/src/main/res/layout/fragment_signup.xml @@ -6,27 +6,13 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - @@ -109,7 +95,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tlMobileNumber" /> - \ No newline at end of file